[PATCH 3/3] rebase -i: handle core.commentChar=auto
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Nov 21, 2016, 14:18 UTC
- Message-ID
- <9ef529a4fbb60990a91d7bbfdd49c6d20d49e442.1479737858.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1479737858.git.johannes.schindelin@gmx.de>
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> --- git-rebase--interactive.sh | 13 +++++++++++-- t/t3404-rebase-interactive.sh | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index ca994c5..6bb740c 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -93,8 +93,17 @@ eval ' GIT_CHERRY_PICK_HELP="$resolvemsg" export GIT_CHERRY_PICK_HELP -comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1) -: ${comment_char:=#} +comment_char=$(git config --get core.commentchar 2>/dev/null) +case "$comment_char" in +''|auto) + comment_char=# + ;; +?) + ;; +*) + comment_char=$(comment_char | cut -c1) + ;; +esac warn () { printf '%s\n' "$*" >&2 diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index e080399..0f3d177 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -976,7 +976,7 @@ test_expect_success 'rebase -i respects core.commentchar' ' 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 && write_script copy-edit-script.sh <<-\EOF && cp "$1" edit-script
-- 2.10.1.583.g721a9e0