git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 1/2] rebase -i: fix skip_unnecessary_picks() to respect core.commentchar

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Aug 18, 2013, 17:12 UTC
Message-ID
<1376845970-31204-2-git-send-email-sunshine@sunshineco.com>
In-Reply-To
<1376845970-31204-1-git-send-email-sunshine@sunshineco.com>

eff80a9fd990de36 (Allow custom "comment char", 2013-01-16) added general core.commentchar support but forgot to update git-rebase--interactive to respect it. 180bad3d10fe3a7f (rebase -i: respect core.commentchar, 2013-02-11) addressed this oversight but missed one instance of hard-coded '#' comment character in skip_unnecessary_picks(). Fix this.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
Suitable for 'maint'.
 git-rebase--interactive.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index ea11e62..3733312 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -671,7 +671,7 @@ skip_unnecessary_picks () {
 				;;
 			esac
 			;;
-		3,#*|3,)
+		3,"$comment_char"*|3,)
 			# copy comments
 			;;
 		*)
-- 
1.8.4.rc3.500.gc3113b0
Previous: Eric SunshineNext: Eric Sunshine
Message 2 of 5 in “fix cases of rebase -i ignoring core.commentchar”
  1. 0/2 fix cases of rebase -i ignoring core.commentcharEric Sunshine, Aug 18, 2013
  2. 1/2 rebase -i: fix skip_unnecessary_picks() to respect core.commentcharEric Sunshine, Aug 18, 2013
  3. 2/2 rebase -i: fix core.commentchar regressionEric Sunshine, Aug 18, 2013
  4. Junio C HamanoAug 18, 2013
  5. Eric SunshineAug 19, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.