From: Miguel Torroja <miguel.torroja@gmail.com>
To: git@vger.kernel.org
Cc: Miguel Torroja <miguel.torroja@gmail.com>
Subject: [PATCH 2/2] fast-export: DIFF_STATUS_RENAMED instead of 'R'
Date: Tue, 25 Apr 2017 02:04:28 +0200 [thread overview]
Message-ID: <1493078668-1354-2-git-send-email-miguel.torroja@gmail.com> (raw)
In-Reply-To: <1493078668-1354-1-git-send-email-miguel.torroja@gmail.com>
Minor change to be consistent with the rest of the fast-export code.
DIFF_STATUS_RENAMED is defined as 'R'.
Signed-off-by: Miguel Torroja <miguel.torroja@gmail.com>
---
builtin/fast-export.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index a3ab7da..4d39324 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -280,7 +280,7 @@ static int diff_type_cmp(const void *a_, const void *b_)
* appear in the output before it is renamed (e.g., when a file
* was copied and renamed in the same commit).
*/
- return (a->status == 'R') - (b->status == 'R');
+ return (a->status == DIFF_STATUS_RENAMED) - (b->status == DIFF_STATUS_RENAMED);
}
static void print_path_1(const char *path)
--
2.1.4
next prev parent reply other threads:[~2017-04-25 0:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-25 0:04 [PATCH 1/2] fast-export: deletion action first Miguel Torroja
2017-04-25 0:04 ` Miguel Torroja [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-04-25 0:12 Miguel Torroja
2017-04-25 0:12 ` [PATCH 2/2] fast-export: DIFF_STATUS_RENAMED instead of 'R' Miguel Torroja
2017-04-24 23:04 [PATCH 1/2] fast-export: deletion action first Miguel Torroja
2017-04-24 23:04 ` [PATCH 2/2] fast-export: DIFF_STATUS_RENAMED instead of 'R' Miguel Torroja
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1493078668-1354-2-git-send-email-miguel.torroja@gmail.com \
--to=miguel.torroja@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).