# git/lib and git/git-gui/lib merge mis-hap? 5 messages from 2008-11-01 to 2008-11-03. Participants: Andreas Ericsson, Shawn O. Pearce, Junio C Hamano. Thread: https://gitlist.dev/t/16122 ## Andreas Ericsson, 2008-11-01 19:30 Subject: git/lib and git/git-gui/lib merge mis-hap? Message-ID: <490CAE40.4060300@op5.se> URL: https://gitlist.dev/e/490CAE40.4060300%40op5.se ``` Settling down to get some libgit2 hacking done (adding build-rules to git.git), I noticed that there's a file in git.git called lib/remote_add.tcl, which looks as if it belongs in git-gui/lib. I don't know how this happened, but since I assume it's subtree merged (thus requiring more work to correct than a simple patch), it would be nifty if it could get corrected so as to make space for the up-and-coming git library :-) -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 ``` ## Shawn O. Pearce, 2008-11-01 20:22 Subject: Re: git/lib and git/git-gui/lib merge mis-hap? Message-ID: <20081101202201.GA15463@spearce.org> URL: https://gitlist.dev/e/20081101202201.GA15463%40spearce.org In-Reply-To: <490CAE40.4060300@op5.se> ``` Andreas Ericsson wrote: > Settling down to get some libgit2 hacking done (adding build-rules > to git.git), I noticed that there's a file in git.git called > lib/remote_add.tcl, which looks as if it belongs in git-gui/lib. > > I don't know how this happened, but since I assume it's subtree > merged (thus requiring more work to correct than a simple patch), > it would be nifty if it could get corrected so as to make space > for the up-and-coming git library :-) That was a bad merge of git-gui on my part. I thought it was fixed. It only happened in next, and was there only for a day before someone pointed it out to me, and I fixed it in the tree. FWIW, "git mv lib/remote_add.tcl git-gui/lib" is all you need to fix it. There's nothing special about the subtree merge. -- Shawn. ``` ## Junio C Hamano, 2008-11-01 22:46 Subject: Re: git/lib and git/git-gui/lib merge mis-hap? Message-ID: <7vljw33vz5.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vljw33vz5.fsf%40gitster.siamese.dyndns.org In-Reply-To: <20081101202201.GA15463@spearce.org> ``` "Shawn O. Pearce" writes: > Andreas Ericsson wrote: >> Settling down to get some libgit2 hacking done (adding build-rules >> to git.git), I noticed that there's a file in git.git called >> lib/remote_add.tcl, which looks as if it belongs in git-gui/lib. >> >> I don't know how this happened, but since I assume it's subtree >> merged (thus requiring more work to correct than a simple patch), >> it would be nifty if it could get corrected so as to make space >> for the up-and-coming git library :-) > > That was a bad merge of git-gui on my part. I thought it was fixed. > It only happened in next, and was there only for a day before > someone pointed it out to me, and I fixed it in the tree. You seem to have further changes to the master branch of git-gui. Would it be a good time to pull for me? The same question goes to maint as well. ``` ## Shawn O. Pearce, 2008-11-01 23:14 Subject: Re: git/lib and git/git-gui/lib merge mis-hap? Message-ID: <20081101231432.GE15463@spearce.org> URL: https://gitlist.dev/e/20081101231432.GE15463%40spearce.org In-Reply-To: <7vljw33vz5.fsf@gitster.siamese.dyndns.org> ``` Junio C Hamano wrote: > > You seem to have further changes to the master branch of git-gui. Would > it be a good time to pull for me? The same question goes to maint as > well. Yup. I was getting ready to ask you to pull. Can you pull maint and master? :-) -- Shawn. ``` ## Andreas Ericsson, 2008-11-03 10:27 Subject: Re: git/lib and git/git-gui/lib merge mis-hap? Message-ID: <490ED1FE.2000209@op5.se> URL: https://gitlist.dev/e/490ED1FE.2000209%40op5.se In-Reply-To: <20081101202201.GA15463@spearce.org> ``` Shawn O. Pearce wrote: > Andreas Ericsson wrote: >> Settling down to get some libgit2 hacking done (adding build-rules >> to git.git), I noticed that there's a file in git.git called >> lib/remote_add.tcl, which looks as if it belongs in git-gui/lib. >> >> I don't know how this happened, but since I assume it's subtree >> merged (thus requiring more work to correct than a simple patch), >> it would be nifty if it could get corrected so as to make space >> for the up-and-coming git library :-) > > That was a bad merge of git-gui on my part. I thought it was fixed. > It only happened in next, and was there only for a day before > someone pointed it out to me, and I fixed it in the tree. > > FWIW, "git mv lib/remote_add.tcl git-gui/lib" is all you need to > fix it. There's nothing special about the subtree merge. > I just pulled latest next, and it's fixed now. Thanks. -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 ```