From: Clemens Buchacher <drizzd@aon.at>
Date: Tue, 17 Apr 2012 21:47:01 GMT
Subject: Re: [PATCH v6 4/4] git-rebase: add keep_empty flag
Message-ID: <20120417214659.GC19908@ecki>
In-Reply-To: <1334686809-17634-5-git-send-email-nhorman@tuxdriver.com>

On Tue, Apr 17, 2012 at 02:20:09PM -0400, Neil Horman wrote:
>
> @@ -780,9 +793,17 @@ git rev-list $merges_option --pretty=oneline --abbrev-commit \
>  	sed -n "s/^>//p" |
>  while read -r shortsha1 rest
>  do
> +
> +	if test -z "$keep_empty" && is_empty_commit $shortsha1
> +	then
> +		comment_out="# pick"
> +	else
> +		comment_out="pick"
> +	fi

You forgot to change this to comment_out="# " and comment_out="".