mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
0d66e95903
When a cherry-pick of an empty commit is done, release the lock
held on the index.
The fix is the same as was applied to similar code in 4271666046.
Signed-off-by: Chris Johnsen <chris_johnsen@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
34 lines
486 B
Bash
Executable file
34 lines
486 B
Bash
Executable file
#!/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
|