diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-03-08 09:34:13 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-03-08 09:34:13 +0300 |
commit | 934f788981de941814e821217f32451a5c715d5d (patch) | |
tree | b98d42ef8c9606b34f9b9389d2d65190db1ecc37 /t/t3505-cherry-pick-empty.sh | |
parent | 113106e06c48cc80432fd1be8af912898e8f240e (diff) | |
parent | 9a6682bab5e800465f0a4e44cdf18fe396ff4f6d (diff) |
Merge branch 'maint'
* maint:
builtin-revert.c: release index lock when cherry-picking an empty commit
document config --bool-or-int
t1300: use test_must_fail as appropriate
cleanup: add isascii()
Documentation: fix badly indented paragraphs in "--bisect-all" description
Diffstat (limited to 't/t3505-cherry-pick-empty.sh')
-rwxr-xr-x | t/t3505-cherry-pick-empty.sh | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh new file mode 100755 index 0000000000..9aaeabd972 --- /dev/null +++ b/t/t3505-cherry-pick-empty.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +test_description='test cherry-picking an empty commit' + +. ./test-lib.sh + +test_expect_success setup ' + + echo first > file1 && + git add file1 && + test_tick && + git commit -m "first" && + + git checkout -b empty-branch && + test_tick && + git commit --allow-empty -m "empty" + +' + +test_expect_code 1 'cherry-pick an empty commit' ' + + git checkout master && + git cherry-pick empty-branch + +' + +test_expect_success 'index lockfile was removed' ' + + test ! -f .git/index.lock + +' + +test_done |