Re: [PATCH] contrib/subtree: unwrap tag refs
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 13, 2016, 17:40 UTC
- Message-ID
- <xmqq8u3tpedq.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <87d1t6p5ov.fsf@waller.obbligato.org>
greened@obbligato.org (David A. Greene) writes:
Show 35 quoted lines
> I am sorry I neglected to follow-up on this. > > greened@obbligato.org (David A. Greene) writes: > >> Rob Mayoff <mayoff@dqd.com> writes: >> >>> diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh >>> index 9f06571..b051600 100755 >>> --- a/contrib/subtree/git-subtree.sh >>> +++ b/contrib/subtree/git-subtree.sh >>> @@ -245,7 +245,10 @@ find_latest_squash() >>> case "$a" in >>> START) sq="$b" ;; >>> git-subtree-mainline:) main="$b" ;; >>> - git-subtree-split:) sub="$b" ;; >>> + git-subtree-split:) >>> + sub="$b" >> >> Why include the above line? > > My bad. Missed the diff markers. This is fine. > >>> + sub="$(git rev-parse "$b^0")" || die "could not rev-parse split hash $b from commit $sq" >> >> This seems like odd quoting. Would not this do the same? >> >> sub="$(git rev-parse $b^0)" || die "could not rev-parse split hash $b from commit $sq" >> >> Perhaps I am missing something. > > Jeff explained it, so this is ok. > > This all looks good to me. Junio, please apply. > > -David
Thanks, all. Let's mark rm/subtree-unwrap-tags topic to be merged to 'next', then.