From: Eric Sunshine <sunshine@sunshineco.com>
Date: Fri, 16 Aug 2013 21:44:07 +0000 (-0400)
Subject: rebase -i: fix cases ignoring core.commentchar
X-Git-Tag: v1.8.4.2~22^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7bca7afeff6f17309545cd2c8431b7228d1151ab;p=thirdparty%2Fgit.git

rebase -i: fix cases ignoring core.commentchar

180bad3d (rebase -i: respect core.commentchar, 2013-02-11) updated
"rebase -i" to honor core.commentchar but missed one instance of
hard-coded '#' comment character in skip_unnecessary_picks().

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 5822b2c592..1e3097ed24 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -661,7 +661,7 @@ skip_unnecessary_picks () {
 				;;
 			esac
 			;;
-		3,#*|3,)
+		3,"$comment_char"*|3,)
 			# copy comments
 			;;
 		*)