Re: [PATCH 2/4] Rework redo_merge

From

Johannes Schindelin <johannes.schindelin@gmx.de>

Date

Mar 23, 2008, 22:29 UTC

Message-ID

<alpine.LSU.1.00.0803232327330.4353@racer.site>

In-Reply-To

<1206308562-31489-2-git-send-email-joerg@alea.gnuu.de>

Hi,

On Sun, 23 Mar 2008, Jörg Sommer wrote:

> 
> Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>

"Rework" is not really informative.

> -		output git merge $STRATEGY -m "$msg" \
> -			$new_parents
> +		output git merge $STRATEGY -m "$msg" "$@"

This should rather go into 1/4.

> @@ -197,8 +199,7 @@ pick_one_preserving_merges () {
>  		case "$new_parents" in
>  		' '*' '*)
>  			# No point in merging the first parent, that's HEAD
> -			new_parents=${new_parents# $first_parent}
> -			redo_merge
> +			redo_merge $sha1 ${new_parents# $first_parent}

Likewise.

Sidenote: it is a bit of cheating to set sha1=$1 in redo_merge(), since it 
is _not_ a local variable there, but the code _relies_ on sha1 being the 
same after calling redo_merge().