aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-07 21:00:27 -0800
committerJunio C Hamano <gitster@pobox.com>2009-03-07 21:00:27 -0800
commit9a6682bab5e800465f0a4e44cdf18fe396ff4f6d (patch)
tree3c30b2efc28194a883daced243837aa9ce9a69dd /t
parentd57f07ebae7e84b356ff2b891adeccf965d2ba11 (diff)
parent0d66e95903a5c2567baa61cc7299ce865abe41b1 (diff)
downloadgit-9a6682bab5e800465f0a4e44cdf18fe396ff4f6d.tar.gz
git-9a6682bab5e800465f0a4e44cdf18fe396ff4f6d.tar.xz
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: builtin-revert.c: release index lock when cherry-picking an empty commit
Diffstat (limited to 't')
-rwxr-xr-xt/t3505-cherry-pick-empty.sh33
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 000000000..9aaeabd97
--- /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