Re: [PATCH] contrib/subtree: unwrap tag refs

From: David A. Greene <greened@obbligato.org>
Date: Nov 13, 2015, 04:36 UTC
Message-ID: <87h9kqwm67.fsf@waller.obbligato.org>
In-Reply-To: <1447388144-23806-1-git-send-email-git@rob.dqd.com>

Rob Mayoff <mayoff@dqd.com> writes:

Show 11 quoted lines

> 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?

> +				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.

Show 11 quoted lines

> +				;;
>  			END)
>  				if [ -n "$sub" ]; then
>  					if [ -n "$main" ]; then
> @@ -278,7 +281,10 @@ find_existing_splits()
>  		case "$a" in
>  			START) sq="$b" ;;
>  			git-subtree-mainline:) main="$b" ;;
> -			git-subtree-split:) sub="$b" ;;
> +			git-subtree-split:)
> +				sub="$b"

And here too.

> +				sub="$(git rev-parse "$b^0")" || die "could not rev-parse split hash $b from commit $sq"

Same as above.

                        -David