From: Junio C Hamano Date: Tue, 30 Sep 2014 05:17:21 +0000 (-0700) Subject: Merge branch 'sb/merge-recursive-copy-paste-fix' X-Git-Tag: v2.2.0-rc0~69 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ab9bc95d537187fc39465bca1d40438b2e2ee6b5 Merge branch 'sb/merge-recursive-copy-paste-fix' "git merge-recursive" had a small bug that could have made it mishandle "one side deleted, the other side did not touch it" in a rare corner case, where the other side actually did touch to cause the blob object names to be different but both blobs before and after the change normalize to the same (e.g. correcting mistake to check in a blob with CRLF line endings by replacing it with another blob that records the same contents with LF line endings). * sb/merge-recursive-copy-paste-fix: merge-recursive: remove stale commented debugging code merge-recursive: fix copy-paste mistake --- ab9bc95d537187fc39465bca1d40438b2e2ee6b5 diff --cc merge-recursive.c index 22315c370a,7220199408..8ad4be897d --- a/merge-recursive.c +++ b/merge-recursive.c @@@ -1686,12 -1107,7 +1686,8 @@@ static int merge_content(struct merge_o static int process_entry(struct merge_options *o, const char *path, struct stage_data *entry) { - /* - printf("processing entry, clean cache: %s\n", index_only ? "yes": "no"); - print_index_entry("\tpath: ", entry); - */ int clean_merge = 1; + int normalize = o->renormalize; unsigned o_mode = entry->stages[1].mode; unsigned a_mode = entry->stages[2].mode; unsigned b_mode = entry->stages[3].mode;