Re: [PATCH] rebase-am: fix regression with new cover-letter config

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 15, 2013, 01:48 UTC
Message-ID: <7vhaj84l8m.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1365978424-11841-1-git-send-email-felipe.contreras@gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

Show 9 quoted lines

> If you have a cover-letter configuration set to anything other than
> 'false', 'git format-patch' might generate a cover letter, and 'git am'
> doesn't seem to like that.
>
> Ideally 'git am' should skip the cover-letter, but for now lets just fix
> the regression.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---

This is a follow-up to the fc/send-email-annotate topic, right?

You are mean to say "fix regression", which gave me a small heart attack ;-). I was worried if we had already merged it to 'next'.

As I already wrote in the recent "What's cooking", the series looks good to me. I am inclined to say that we should merge it (together with this update) to 'next'.

Thanks for catching this before breaking the real world users.

Show 18 quoted lines

>  git-rebase--am.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/git-rebase--am.sh b/git-rebase--am.sh
> index 97f31dc..f84854f 100644
> --- a/git-rebase--am.sh
> +++ b/git-rebase--am.sh
> @@ -31,8 +31,8 @@ else
>  	rm -f "$GIT_DIR/rebased-patches"
>  
>  	git format-patch -k --stdout --full-index --ignore-if-in-upstream \
> -		--src-prefix=a/ --dst-prefix=b/ \
> -		--no-renames $root_flag "$revisions" >"$GIT_DIR/rebased-patches"
> +		--src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
> +		$root_flag "$revisions" >"$GIT_DIR/rebased-patches"
>  	ret=$?
>  
>  	if test 0 != $ret