{"thread":{"id":"16995","subject":"[BUG] unable to checkout branch with a clean worktree","startedAt":"2009-01-05T15:42:48Z","lastAt":"2009-01-05T17:54:48Z","messageCount":3,"participants":["Anders Melchiorsen","Clemens Buchacher"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"99364","messageId":"35079.bFoQE3daRhY=.1231170168.squirrel@webmail.hotelhot.dk","threadId":"16995","inReplyTo":null,"subject":"[BUG] unable to checkout branch with a clean worktree","fromName":"Anders Melchiorsen","fromEmail":"mail@cup.kalibalik.dk","sentAt":"2009-01-05T15:42:48Z","receivedAt":"2009-01-05T15:42:48Z","isPatch":false,"sender":{"key":"mail@cup.kalibalik.dk","avatar":null},"body":"Git v1.6.1: The final checkout fails with an error about merge conflicts.\nHowever, the worktree is clean, and I am not trying to do a merge.\n\nIs this a known issue? If so, what is the particular issue that we should\navoid?\n\n\nRegards,\nAnders.\n\n\ncd $(mktemp -d repo.XXXXXX)\ngit init\n\necho init >start\ngit add start\ngit commit -m A\n\ngit branch parallel\n\nmkdir a b\necho x >a/one\necho y >a/two\necho z >b/three\ngit add .\ngit commit -m B\n\ngit checkout parallel\nmkdir -p a/one a/two b\necho xx >a/one/cat\necho yy >a/two/cow\necho zz >b/unrelated\ngit add .\ngit commit -m C\n\n# This fails:\ngit checkout master\n"},{"id":"99367","messageId":"20090105160527.GA7718@localhost","threadId":"16995","inReplyTo":"35079.bFoQE3daRhY=.1231170168.squirrel@webmail.hotelhot.dk","subject":"Re: [BUG] unable to checkout branch with a clean worktree","fromName":"Clemens Buchacher","fromEmail":"drizzd@aon.at","sentAt":"2009-01-05T16:05:27Z","receivedAt":"2009-01-05T16:05:27Z","isPatch":false,"sender":{"key":"drizzd@gmx.net","avatar":"https://avatars.githubusercontent.com/u/59082?v=4"},"body":"On Mon, Jan 05, 2009 at 04:42:48PM +0100, Anders Melchiorsen wrote:\n> Git v1.6.1: The final checkout fails with an error about merge conflicts.\n> However, the worktree is clean, and I am not trying to do a merge.\n> \n> Is this a known issue? If so, what is the particular issue that we should\n> avoid?\n\nThis is fixed by the recent patches for verify_absent. (Actually, just PATCH\n2/3 should be enough to fix this issue.)\n\nhttp://article.gmane.org/gmane.comp.version-control.git/104317\n"},{"id":"99373","messageId":"87fxjxk593.fsf@cup.kalibalik.dk","threadId":"16995","inReplyTo":"20090105160527.GA7718@localhost","subject":"Re: [BUG] unable to checkout branch with a clean worktree","fromName":"Anders Melchiorsen","fromEmail":"mail@cup.kalibalik.dk","sentAt":"2009-01-05T17:54:48Z","receivedAt":"2009-01-05T17:54:48Z","isPatch":false,"sender":{"key":"mail@cup.kalibalik.dk","avatar":null},"body":"Clemens Buchacher <drizzd@aon.at> writes:\n\n> On Mon, Jan 05, 2009 at 04:42:48PM +0100, Anders Melchiorsen wrote:\n>> Git v1.6.1: The final checkout fails with an error about merge conflicts.\n>\n> This is fixed by the recent patches for verify_absent. (Actually,\n> just PATCH 2/3 should be enough to fix this issue.)\n>\n> http://article.gmane.org/gmane.comp.version-control.git/104317\n\nRight, I can confirm that the patch [2/3] fixes this, also in the repo\nwhere the issue originally turned up.\n\n\nThanks,\nAnders.\n"}]}