All of lore.kernel.org
 help / color / mirror / Atom feed
From: greened@obbligato.org (David A. Greene)
To: Rob Mayoff <mayoff@dqd.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] contrib/subtree: unwrap tag refs
Date: Tue, 12 Jan 2016 20:35:28 -0600	[thread overview]
Message-ID: <87d1t6p5ov.fsf@waller.obbligato.org> (raw)
In-Reply-To: <87h9kqwm67.fsf@waller.obbligato.org> (David A. Greene's message of "Thu, 12 Nov 2015 22:36:16 -0600")

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

  parent reply	other threads:[~2016-01-13  2:36 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-13  4:15 [PATCH] contrib/subtree: unwrap tag refs Rob Mayoff
2015-11-13  4:36 ` David A. Greene
2015-11-13  5:01   ` Jeff King
2016-01-13  2:35   ` David A. Greene [this message]
2016-01-13 17:40     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87d1t6p5ov.fsf@waller.obbligato.org \
    --to=greened@obbligato.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mayoff@dqd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.