kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

rebase -i: handle core.commentChar=auto 

When 84c9dc2 (commit: allow core.commentChar=auto for character auto
selection, 2014-05-17) extended the core.commentChar functionality to
allow for the value 'auto', it forgot that rebase -i was already taught to
handle core.commentChar, and in turn forgot to let rebase -i handle that
new value gracefully.

Reported by Taufiq Hoven.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2016-11-21 15:18:29 +01:00 committed by Junio C Hamano
parent 92068ae8bf
commit 882cd23777
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
git-rebase--interactive.sh
View File

@ -93,8 +93,17 @@ eval '
GIT_CHERRY_PICK_HELP="$resolvemsg" GIT_CHERRY_PICK_HELP="$resolvemsg"
export GIT_CHERRY_PICK_HELP export GIT_CHERRY_PICK_HELP


comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1) comment_char=$(git config --get core.commentchar 2>/dev/null)
: ${comment_char:=#} case "$comment_char" in
'' | auto)
comment_char="#"
;;
?)
;;
*)
comment_char=$(echo "$comment_char" | cut -c1)
;;
esac


warn () { warn () {
printf '%s\n' "$*" >&2 printf '%s\n' "$*" >&2

2
t/t3404-rebase-interactive.sh
View File

@ -983,7 +983,7 @@ test_expect_success 'rebase -i respects core.commentchar' '
test B = $(git cat-file commit HEAD^ | sed -ne \$p) test B = $(git cat-file commit HEAD^ | sed -ne \$p)
' '


test_expect_failure 'rebase -i respects core.commentchar=auto' ' test_expect_success 'rebase -i respects core.commentchar=auto' '
test_config core.commentchar auto && test_config core.commentchar auto &&
write_script copy-edit-script.sh <<-\EOF && write_script copy-edit-script.sh <<-\EOF &&
cp "$1" edit-script cp "$1" edit-script