Re: [BUG] fatal error during merge
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:46:44
Hi, On Sun, 10 May 2009, Alex Riesen wrote:
quoted hunk ↗ jump to hunk
diff --git a/merge-recursive.c b/merge-recursive.c index a3721ef..d5c43d1 100644 --- a/merge-recursive.c +++ b/merge-recursive.c@@ -980,14 +980,15 @@ static int process_renames(struct merge_options *o, if (mfi.clean && sha_eq(mfi.sha, ren1->pair->two->sha1) && - mfi.mode == ren1->pair->two->mode) + mfi.mode == ren1->pair->two->mode) { /* * This messaged is part of * t6022 test. If you change * it update the test too. */ output(o, 3, "Skipped %s (merged same as existing)", ren1_dst); - else { + add_cacheinfo(mfi.mode, mfi.sha, ren1_dst, 0, 0, ADD_CACHE_OK_TO_ADD); + } else { if (mfi.merge || !mfi.clean)
If I read the message right, the file revision is supposed not to be changed from HEAD. Is unpack_trees() invalidating the "cleanness" of that file? (I would really love to have a better idea what's going on than what I get from both the commit message and the patch before giving my ACK.) Ciao, Dscho