Skip to contentSkip to conversation

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

DISCUSSION Andreas Ericsson 3 participants 5 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

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 :-)

Signature · 3 lines
Andreas Ericsson                   [email protected]
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231
#1 lore raw
Quoted 8 lines · Andreas Ericsson

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.

Signature · 1 line
Shawn.
#2 lore raw
Quoted 10 lines · Shawn O. Pearce
Quoted 8 lines · Andreas Ericsson

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 :-)

Quoted 7 lines

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.

Signature · 3 lines
Andreas Ericsson                   [email protected]
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231
#3 lore raw
In reply to Shawn O. Pearce
Quoted 5 lines · Shawn O. Pearce
Quoted 4 lines · Andreas Ericsson

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.

Quoted 8 lines
Quoted 4 lines

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.

#4 lore raw
Quoted 4 lines · Junio C Hamano

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?

:-)

Signature · 1 line
Shawn.