From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [BUG] merge-recursive triggered "BUG"
Date: Thu, 17 Mar 2011 14:45:03 -0700 [thread overview]
Message-ID: <7vpqpp1kww.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7v4o7260no.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 16 Mar 2011 17:39:07 -0700")
To illustrate the issue a bit better, with this patch applied on top of
the en/merge-recursive topic, we get the same errors:
Merging:
31734dd Renamed and modified
virtual merge-branch-1
found 1 common ancestor(s):
13277ae Common commmit
Skipped rename (merged same as existing)
error: addinfo_cache failed for path 'rename'
rename: unmerged (f00c965d8307308469e537302baa73048488f162)
rename: unmerged (3bb459b831ea471b9cd1cbb7c6d54a74251a711b)
rename: unmerged (f00c965d8307308469e537302baa73048488f162)
fatal: git write-tree failed to write a tree
In the test case, the merge machinery should notice that the result of the
merge structurally place the merge result in the path "rename", and the
content of the resulting blob matches what our side already have, so we
should end up with a clean merge in the index (the index has the same blob
as the HEAD at path "rename"), keeping the updated contents in the working
tree.
t/t6022-merge-rename.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 7d955c1..94b9c00 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -730,6 +730,7 @@ test_expect_success 'setup avoid unnecessary update, normal rename' '
test_expect_success 'avoid unnecessary update, normal rename' '
git checkout -q avoid-unnecessary-update-1^0 &&
+ echo modified >>rename &&
test-chmtime =1000000000 rename &&
test-chmtime -v +0 rename >expect &&
git merge merge-branch-1 &&
next prev parent reply other threads:[~2011-03-17 21:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-17 0:39 [BUG] merge-recursive triggered "BUG" Junio C Hamano
2011-03-17 21:45 ` Junio C Hamano [this message]
2011-03-18 6:07 ` [PATCH] merge-recursive: tweak magic band-aid Junio C Hamano
2011-03-21 18:24 ` Elijah Newren
2011-05-20 1:14 ` [BUG] merge-recursive triggered "BUG" Jay Soffian
2011-05-20 1:17 ` Jay Soffian
2011-05-20 3:21 ` Junio C Hamano
2011-05-20 12:29 ` Jay Soffian
2011-05-20 13:00 ` Jay Soffian
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=7vpqpp1kww.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/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).