{"thread":{"id":"28967","subject":"[PATCH] Use macro define to replace magic character","startedAt":"2011-11-18T01:43:06Z","lastAt":"2011-11-18T01:43:06Z","messageCount":1,"participants":["Zheng Liu"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"179661","messageId":"1321580586-19247-1-git-send-email-wenqing.lz@taobao.com","threadId":"28967","inReplyTo":null,"subject":"[PATCH] Use macro define to replace magic character","fromName":"Zheng Liu","fromEmail":"gnehzuil.liu@gmail.com","sentAt":"2011-11-18T01:43:06Z","receivedAt":"2011-11-18T01:43:06Z","isPatch":true,"sender":{"key":"gnehzuil.liu@gmail.com","avatar":null},"body":"We should use macro define rather than magic character to make more readable\n\nSigned-off-by: Zheng Liu <wenqing.lz@taobao.com>\n---\n merge-recursive.c |    2 +-\n tree-diff.c       |    2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex cc664c3..96457bc 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -503,7 +503,7 @@ static struct string_list *get_renames(struct merge_options *o,\n \t\tstruct string_list_item *item;\n \t\tstruct rename *re;\n \t\tstruct diff_filepair *pair = diff_queued_diff.queue[i];\n-\t\tif (pair->status != 'R') {\n+\t\tif (pair->status != DIFF_STATUS_RENAMED) {\n \t\t\tdiff_free_filepair(pair);\n \t\t\tcontinue;\n \t\t}\ndiff --git a/tree-diff.c b/tree-diff.c\nindex b3cc2e4..d52c440 100644\n--- a/tree-diff.c\n+++ b/tree-diff.c\n@@ -225,7 +225,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co\n \t\t * diff_queued_diff, we will also use that as the path in\n \t\t * the future!\n \t\t */\n-\t\tif ((p->status == 'R' || p->status == 'C') &&\n+\t\tif ((p->status == DIFF_STATUS_RENAMED || p->status == DIFF_STATUS_COPIED) &&\n \t\t    !strcmp(p->two->path, opt->pathspec.raw[0])) {\n \t\t\t/* Switch the file-pairs around */\n \t\t\tq->queue[i] = choice;\n-- \n1.7.5.4\n"}]}