SZEDER Gábor wrote: > > On Thu, Nov 13, 2008 at 02:23:19PM +0100, Samuel Tardieu wrote: >> >>>>> "Anders" == Anders Melchiorsen <mail@xxxxxxxxxxxxxxxx> writes: >> >> Anders> I have tested the script with Git 1.6.0.2, but the real >> Anders> scenario that made this appear seems to also fail with master >> Anders> and next from git.git. >> >> I confirm that your test case also fails with the current "next". > > Yeah, and it can be bisected to commit 621ff675 (rev-parse: fix > meaning of rev~ vs rev~0, 2008-03-14), which is from Linus, so put him > on Cc. I guess that is due to using HEAD~ in the test script? If you are bisecting, here is a version that does not use the HEAD~ notation: mkdir am-merge-fail cd am-merge-fail git init mkdir before touch before/one after git add before after git commit -minitial git branch parallel rm -f after git mv before after git commit -mmove git checkout parallel touch other git add other git commit -mparallel git merge master -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
