threads / discuss / 16122

git/lib and git/git-gui/lib merge mis-hap?

Subject: git/lib and git/git-gui/lib merge mis-hap?

## tl;dr

5 messages between Nov 1, 2008 and Nov 3, 2008.

replies: 4people: 3as markdown or json

Andreas Ericsson· Nov 1, 2008, 19:30 UTC · lore

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· Nov 1, 2008, 20:22 UTC · re: Andreas Ericsson · lore

Re: git/lib and git/git-gui/lib merge mis-hap?

Andreas Ericsson <ae@op5.se> wrote:
Show 8 quoted lines
> 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· Nov 1, 2008, 22:46 UTC · re: Shawn O. Pearce · lore

Re: git/lib and git/git-gui/lib merge mis-hap?

"Shawn O. Pearce" <spearce@spearce.org> writes:
Show 13 quoted lines
> Andreas Ericsson <ae@op5.se> 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· Nov 1, 2008, 23:14 UTC · re: Junio C Hamano · lore

Re: git/lib and git/git-gui/lib merge mis-hap?

Junio C Hamano <gitster@pobox.com> 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· Nov 3, 2008, 10:27 UTC · re: Shawn O. Pearce · lore

Re: git/lib and git/git-gui/lib merge mis-hap?

Shawn O. Pearce wrote:
Show 17 quoted lines
> Andreas Ericsson <ae@op5.se> 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

← back to recent threads