diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-07-13 15:15:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-07-13 15:15:13 -0700 |
commit | fc062aa2e121d7976a741e7b8b5ba98f2e26056d (patch) | |
tree | acff80f8aed9b3b5424cd553bd3e1103596b9732 /t | |
parent | ef567fe70adced1a844088e04dc4b6dd4e83edfb (diff) | |
parent | f95ebf74296077d5fdccaa2668edc527841db521 (diff) | |
download | git-fc062aa2e121d7976a741e7b8b5ba98f2e26056d.tar.gz |
Merge branch 'js/pick-root'
* js/pick-root:
Allow cherry-picking root commits
Diffstat (limited to 't')
-rwxr-xr-x | t/t3503-cherry-pick-root.sh | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/t3503-cherry-pick-root.sh b/t/t3503-cherry-pick-root.sh new file mode 100755 index 0000000000..b0faa29918 --- /dev/null +++ b/t/t3503-cherry-pick-root.sh @@ -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 |