diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-02-05 14:01:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-05 14:01:09 -0800 |
| commit | a118beeddf9d0373078595dd1d1d5f33441a1cdd (patch) | |
| tree | d4befbf13141706b88aded2f329d388c7084c731 /t | |
| parent | Merge branch 'tr/send-email-ssl' into maint (diff) | |
| parent | commit -v: strip diffs and submodule shortlogs from the commit message (diff) | |
| download | tgif-a118beeddf9d0373078595dd1d1d5f33441a1cdd.tar.xz | |
Merge branch 'jl/commit-v-strip-marker' into maint
"git commit -v" appends the patch to the log message before
editing, and then removes the patch when the editor returned
control. However, the patch was not stripped correctly when the
first modified path was a submodule.
* jl/commit-v-strip-marker:
commit -v: strip diffs and submodule shortlogs from the commit message
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7507-commit-verbose.sh | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh index da5bd3b5a5..2ddf28c984 100755 --- a/t/t7507-commit-verbose.sh +++ b/t/t7507-commit-verbose.sh @@ -65,9 +65,35 @@ test_expect_success 'diff in message is retained without -v' ' check_message diff ' -test_expect_failure 'diff in message is retained with -v' ' +test_expect_success 'diff in message is retained with -v' ' git commit --amend -F diff -v && check_message diff ' +test_expect_success 'submodule log is stripped out too with -v' ' + git config diff.submodule log && + git submodule add ./. sub && + git commit -m "sub added" && + ( + cd sub && + echo "more" >>file && + git commit -a -m "submodule commit" + ) && + ( + GIT_EDITOR=cat && + export GIT_EDITOR && + test_must_fail git commit -a -v 2>err + ) && + test_i18ngrep "Aborting commit due to empty commit message." err +' + +test_expect_success 'verbose diff is stripped out with set core.commentChar' ' + ( + GIT_EDITOR=cat && + export GIT_EDITOR && + test_must_fail git -c core.commentchar=";" commit -a -v 2>err + ) && + test_i18ngrep "Aborting commit due to empty commit message." err +' + test_done |