[PATCH v2 2/2] rebase -i: fix core.commentchar regression
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Aug 18, 2013, 17:12 UTC
- Message-ID
- <1376845970-31204-3-git-send-email-sunshine@sunshineco.com>
- In-Reply-To
- <1376845970-31204-1-git-send-email-sunshine@sunshineco.com>
9a46c25bdbf79744 (rebase: interactive: fix short SHA-1 collision, 2013-08-12) added transform_todo_ids() which assumes incorrectly that the comment character is always '#', however, this has not been the case since 180bad3d10fe3a7f (rebase -i: respect core.commentchar, 2013-02-11) patched rebase -i to respect core.commentchar. Fix this regression.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> ---
Intended for 'next'.
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 3733312..f246810 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -693,7 +693,7 @@ transform_todo_ids () { while read -r command rest do case "$command" in - '#'* | exec) + "$comment_char"* | exec) # Be careful for oddball commands like 'exec' # that do not have a SHA-1 at the beginning of $rest. ;;
-- 1.8.4.rc3.500.gc3113b0