Re: [PATCH v2] cherry-pick: No advice to commit if --no-commit

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Feb 22, 2012, 00:51 UTC
Message-ID: <20120222005133.GC31934@burratino>
In-Reply-To: <1329871457-12890-1-git-send-email-hordp@cisco.com>

Phil Hord wrote:

>                       In case of cherry-pick --no-commit, the
> hint goes too far. It tells the user to finish up with
> 'git commit'.  That is not what this git-cherry-pick was
> trying to do in the first place.

Especially since if I do try to commit as it says, it will not reuse the old commit message and timestamp like the advice made me suspect it would. :)

[...]

Show 10 quoted lines

> --- a/t/t3507-cherry-pick-conflict.sh
> +++ b/t/t3507-cherry-pick-conflict.sh
> @@ -59,6 +59,20 @@ test_expect_success 'advice from failed cherry-pick' "
>  	test_i18ncmp expected actual
>  "
>  
> +test_expect_success 'advice from failed cherry-pick --no-commit' "
> +	pristine_detach initial &&
> +
> +	picked=\$(git rev-parse --short picked) &&

The escaping here is obnoxiously tricky.  Not your fault, though.

For what it's worth,
Acked-by: Jonathan Nieder <jrnieder@gmail.com>

Thanks.