Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* js/pick-root: Allow cherry-picking root commits
- Loading branch information
Showing
2 changed files
with
46 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
#!/bin/sh | ||
|
||
test_description='test cherry-picking a root commit' | ||
|
||
. ./test-lib.sh | ||
|
||
test_expect_success setup ' | ||
echo first > file1 && | ||
git add file1 && | ||
test_tick && | ||
git commit -m "first" && | ||
git symbolic-ref HEAD refs/heads/second && | ||
rm .git/index file1 && | ||
echo second > file2 && | ||
git add file2 && | ||
test_tick && | ||
git commit -m "second" | ||
' | ||
|
||
test_expect_success 'cherry-pick a root commit' ' | ||
git cherry-pick master && | ||
test first = $(cat file1) | ||
' | ||
|
||
test_done |