Re: [PATCH] rebase -i: give rerere a chance

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 29, 2007, 00:17 UTC
Message-ID: <7v7ik129d4.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <Pine.LNX.4.64.0711221117590.27959@racer.site>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 12 quoted lines

> @@ -166,13 +167,13 @@ pick_one_preserving_merges () {
>  			msg="$(git cat-file commit $sha1 | sed -e '1,/^$/d')"
>  			# No point in merging the first parent, that's HEAD
>  			new_parents=${new_parents# $first_parent}
> -			# NEEDSWORK: give rerere a chance
>  			if ! GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
>  				GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
>  				GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
>  				output git merge $STRATEGY -m "$msg" \
>  					$new_parents
>  			then
> +				git rerere

This comment is not about this rerere change, but output is a shell function and I vaguely recall we had a discussion on "VAR=VAL cmd" form of single-shot export not working for them as expected...