Re: [PATCH v2] status: show the branch name if possible in in-progress info

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jan 29, 2013, 18:44 UTC
Message-ID: <20130129184435.GA18266@google.com>
In-Reply-To: <1359471493-32531-1-git-send-email-pclouds@gmail.com>

Hi Duy,

Nguyễn Thái Ngọc Duy wrote:

Show 8 quoted lines

> --- a/t/t7512-status-help.sh
> +++ b/t/t7512-status-help.sh
> @@ -76,7 +76,7 @@ test_expect_success 'status when rebase in progress before resolving conflicts'
>  	test_must_fail git rebase HEAD^ --onto HEAD^^ &&
>  	cat >expected <<-\EOF &&
>  	# Not currently on any branch.
> -	# You are currently rebasing.
> +	# You are currently rebasing branch '\''rebase_conflicts'\'' on '\''000106f'\''.

SHA1-in-tests radar blinking.

Would it be possible to compute the expected output, as in

	dest=$(git rev-parse --short HEAD^^)
	cat >expected <<-EOF &&
	# Not currently on any branch.
	# You are currently rebasing branch '\''rebase_conflicts'\'' on '\''$dest'\''.

I'm not sure what to think about the actual change itself yet. Can you give an example of when you felt the need for this, so it can be included in the commit message or documentation?

Thanks. Jonathan