{"thread":{"id":"41187","subject":"Worktree \"gitdir\" file being mangled after upgrade to 2.7.0","startedAt":"2016-01-13T23:47:53Z","lastAt":"2016-01-15T17:52:59Z","messageCount":6,"participants":["Erik Johnson","Junio C Hamano","Duy Nguyen","Mike Rappazzo","Andreas Schwab"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"275987","messageId":"20160113234753.GA26473@gmail.com","threadId":"41187","inReplyTo":null,"subject":"Worktree \"gitdir\" file being mangled after upgrade to 2.7.0","fromName":"Erik Johnson","fromEmail":"palehose@gmail.com","sentAt":"2016-01-13T23:47:53Z","receivedAt":"2016-01-13T23:47:53Z","isPatch":false,"sender":{"key":"palehose@gmail.com","avatar":"https://gravatar.com/avatar/d40ae5da002709d63d829af7b7259223f303618e22af5a75960201f48780c091?d=mp&s=160"},"body":"Since upgrading to 2.7.0 last week, eventually I'll get to a point when\nI run 'git worktree list' where several worktrees are incorrectly\nreported as pointing to my main git checkout. Further analysis of the\nfiles in $GIT_DIR/worktrees/worktree_name/ shows that the gitdir file\nfor the worktrees which display incorrectly contains \".git\" instead of\nwhat it should contain (i.e. \"/path/to/worktree/.git\".\n\nThis was reported a couple days ago on Github:\n\nhttps://github.com/git/git-scm.com/issues/650\n\nSince the audiences for the mailing list and Github don't overlap\ncompletely, I figured I'd report it here to get this issue in front of\nas many eyes as possible.\n\n--\n\n-Erik\n\n\"For me, it is far better to grasp the universe as it really is than to\npersist in delusion, however satisfying and reassuring.\" --Carl Sagan\n\n"},{"id":"275989","messageId":"xmqqh9iglwf3.fsf@gitster.mtv.corp.google.com","threadId":"41187","inReplyTo":"20160113234753.GA26473@gmail.com","subject":"Re: Worktree \"gitdir\" file being mangled after upgrade to 2.7.0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-01-14T02:36:16Z","receivedAt":"2016-01-14T02:36:16Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Erik Johnson writes:\n\n> Since upgrading to 2.7.0 last week, eventually I'll get to a point when\n> I run 'git worktree list' where several worktrees are incorrectly\n> reported as pointing to my main git checkout. Further analysis of the\n> files in $GIT_DIR/worktrees/worktree_name/ shows that the gitdir file\n> for the worktrees which display incorrectly contains \".git\" instead of\n> what it should contain (i.e. \"/path/to/worktree/.git\".\n>\n> This was reported a couple days ago on Github:\n>\n> https://github.com/git/git-scm.com/issues/650\n>\n> Since the audiences for the mailing list and Github don't overlap\n> completely, I figured I'd report it here to get this issue in front of\n> as many eyes as possible.\n\nThanks for relaying. Duy, Michael, I think this is your area?\n"},{"id":"276003","messageId":"CACsJy8D2Bz42kvBD1e=0oqxrYDry7_wCOy5Fi3oS-sGJxux4-w@mail.gmail.com","threadId":"41187","inReplyTo":"xmqqh9iglwf3.fsf@gitster.mtv.corp.google.com","subject":"Re: Worktree \"gitdir\" file being mangled after upgrade to 2.7.0","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2016-01-14T03:29:29Z","receivedAt":"2016-01-14T03:29:29Z","isPatch":false,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Thu, Jan 14, 2016 at 9:36 AM, Junio C Hamano wrote:\n> Erik Johnson writes:\n>\n>> Since upgrading to 2.7.0 last week, eventually I'll get to a point when\n>> I run 'git worktree list' where several worktrees are incorrectly\n>> reported as pointing to my main git checkout. Further analysis of the\n>> files in $GIT_DIR/worktrees/worktree_name/ shows that the gitdir file\n>> for the worktrees which display incorrectly contains \".git\" instead of\n>> what it should contain (i.e. \"/path/to/worktree/.git\".\n>>\n>> This was reported a couple days ago on Github:\n>>\n>> https://github.com/git/git-scm.com/issues/650\n>>\n>> Since the audiences for the mailing list and Github don't overlap\n>> completely, I figured I'd report it here to get this issue in front of\n>> as many eyes as possible.\n>\n> Thanks for relaying. Duy, Michael, I think this is your area?\n\nThe only place that a relative pat hcan be written is\nupdate_linked_girdir() unless i'm mistaken. That function is being\ndeleted \"soon\" because it causes another problem\n-- \nDuy\n"},{"id":"276022","messageId":"CANoM8SUB5hfZHkLenDEq1O1wFrZno1OUUSH2uwDfihC0z+tUkQ@mail.gmail.com","threadId":"41187","inReplyTo":"CACsJy8D2Bz42kvBD1e=0oqxrYDry7_wCOy5Fi3oS-sGJxux4-w@mail.gmail.com","subject":"Re: Worktree \"gitdir\" file being mangled after upgrade to 2.7.0","fromName":"Mike Rappazzo","fromEmail":"rappazzo@gmail.com","sentAt":"2016-01-14T13:58:02Z","receivedAt":"2016-01-14T13:58:02Z","isPatch":false,"sender":{"key":"rappazzo@gmail.com","avatar":"https://avatars.githubusercontent.com/u/525287?v=4"},"body":"On Wed, Jan 13, 2016 at 10:29 PM, Duy Nguyen wrote:\n> On Thu, Jan 14, 2016 at 9:36 AM, Junio C Hamano wrote:\n>> Erik Johnson writes:\n>>\n>>> Since upgrading to 2.7.0 last week, eventually I'll get to a point when\n>>> I run 'git worktree list' where several worktrees are incorrectly\n>>> reported as pointing to my main git checkout. Further analysis of the\n>>> files in $GIT_DIR/worktrees/worktree_name/ shows that the gitdir file\n>>> for the worktrees which display incorrectly contains \".git\" instead of\n>>> what it should contain (i.e. \"/path/to/worktree/.git\".\n>>>\n>>> This was reported a couple days ago on Github:\n>>>\n>>> https://github.com/git/git-scm.com/issues/650\n>>>\n>>> Since the audiences for the mailing list and Github don't overlap\n>>> completely, I figured I'd report it here to get this issue in front of\n>>> as many eyes as possible.\n>>\n>> Thanks for relaying. Duy, Michael, I think this is your area?\n>\n> The only place that a relative path can be written is\n> update_linked_girdir() unless i'm mistaken. That function is being\n> deleted \"soon\" because it causes another problem\n\n`git worktree list` command does not modify the worktree gitdir file,\nso this is only a symptom of the problem. If at all possible, we\nshould move to get Duy's fix into the 2.7.1 release. This problem\nalmost makes git worktree list useless.\n\n> --\n> Duy\n"},{"id":"276065","messageId":"87oaco2eka.fsf@igel.home","threadId":"41187","inReplyTo":"20160113234753.GA26473@gmail.com","subject":"Re: Worktree \"gitdir\" file being mangled after upgrade to 2.7.0","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2016-01-14T18:36:53Z","receivedAt":"2016-01-14T18:36:53Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Erik Johnson writes:\n\n> Since upgrading to 2.7.0 last week, eventually I'll get to a point when\n> I run 'git worktree list' where several worktrees are incorrectly\n> reported as pointing to my main git checkout. Further analysis of the\n> files in $GIT_DIR/worktrees/worktree_name/ shows that the gitdir file\n> for the worktrees which display incorrectly contains \".git\" instead of\n> what it should contain (i.e. \"/path/to/worktree/.git\".\n\nThis always happens to me when I run \"git rebase\" in a worktree.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"276179","messageId":"xmqqsi1yivb8.fsf@gitster.mtv.corp.google.com","threadId":"41187","inReplyTo":"CANoM8SUB5hfZHkLenDEq1O1wFrZno1OUUSH2uwDfihC0z+tUkQ@mail.gmail.com","subject":"Re: Worktree \"gitdir\" file being mangled after upgrade to 2.7.0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-01-15T17:52:59Z","receivedAt":"2016-01-15T17:52:59Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Mike Rappazzo writes:\n\n>>> Thanks for relaying. Duy, Michael, I think this is your area?\n>>\n>> The only place that a relative path can be written is\n>> update_linked_girdir() unless i'm mistaken. That function is being\n>> deleted \"soon\" because it causes another problem\n>\n> `git worktree list` command does not modify the worktree gitdir file,\n> so this is only a symptom of the problem. If at all possible, we\n> should move to get Duy's fix into the 2.7.1 release. This problem\n> almost makes git worktree list useless.\n\nYes, what's the doneness of that \"being deleted 'soon'\"?\n\nThanks.\n"}]}