diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-03 15:53:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-03 15:53:37 -0700 |
| commit | 831287d37c059d71a20c3c164bc743217114d94e (patch) | |
| tree | afe1ac07d7898100ea4bdb3dd9282899596fe609 /t | |
| parent | Merge branch 'jc/maint-sane-execvp-notdir' (diff) | |
| parent | cherry-pick: add --allow-empty-message option (diff) | |
| download | tgif-831287d37c059d71a20c3c164bc743217114d94e.tar.xz | |
Merge branch 'cw/cherry-pick-allow-empty-message'
"git cherry-pick" by default stops when it sees a commit without any
log message. The "--allow-empty-message" option can be used to
silently proceed.
* cw/cherry-pick-allow-empty-message:
cherry-pick: add --allow-empty-message option
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3505-cherry-pick-empty.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh index 5a1340cee6..a0c6e30d80 100755 --- a/t/t3505-cherry-pick-empty.sh +++ b/t/t3505-cherry-pick-empty.sh @@ -53,6 +53,11 @@ test_expect_success 'index lockfile was removed' ' ' +test_expect_success 'cherry-pick a commit with an empty message with --allow-empty-message' ' + git checkout -f master && + git cherry-pick --allow-empty-message empty-branch +' + test_expect_success 'cherry pick an empty non-ff commit without --allow-empty' ' git checkout master && echo fourth >>file2 && |