Re: [PATCH v6 4/4] git-rebase: add keep_empty flag

On Tue, Apr 17, 2012 at 11:47:01PM +0200, Clemens Buchacher wrote:

On Tue, Apr 17, 2012 at 02:20:09PM -0400, Neil Horman wrote:

quoted

@@ -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="".

Thanks, I'll fix that up when I modify the keep-redundant-commits commit message
Neil