Re: [PATCH] contrib/subtree bugfix: Can't `add` annotated tag

2014-05-12 Thread James Denholm
On Fri, May 09, 2014 at 05:36:15PM +1000, James Denholm wrote: > Junio C Hamano wrote: > > Would it be sufficient to do > > > > git commit-tree $tree $headp -p "$rev^0" > > > > in that "not squashing" codepath instead? > > On line 561, sure. Do you want me to do a re-roll? Sorry to bump,

Re: [PATCH] contrib/subtree bugfix: Can't `add` annotated tag

2014-05-09 Thread James Denholm
Junio C Hamano wrote: > The "rev" (not "revs") seems to be used by more things than the > final commit-tree state. Are we losing some useful information by > peeling it too early like this patch does? (...) You're not wrong, actually, peeling at the last minute (or at least later) would be a bet

Re: [PATCH] contrib/subtree bugfix: Can't `add` annotated tag

2014-05-08 Thread Junio C Hamano
James Denholm writes: > cmd_add_commit() is passed FETCH_HEAD by cmd_add_repository, which is > then rev-parsed into an object ID. However, if the user is fetching a > tag rather than a branch HEAD, such as by executing: > > $ git subtree add -P oldGit https://github.com/git/git.git tags/v1.8.0 >