diff options
| author |  Luke Diamand <luke@diamand.org> | 2020-09-19 09:54:40 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-09-19 13:44:54 -0700 |
| commit | 677fa8d1157c869974355e316d0e2349759d0325 (patch) | |
| tree | ad145c317c38fd244c2b60b81378d733e9a23f7a /t/t9832-unshelve.sh | |
| parent | Git 2.28 (diff) | |
| download | tgif-677fa8d1157c869974355e316d0e2349759d0325.tar.xz | |
git-p4 unshelve: adding a commit breaks git-p4 unshelve
git-p4 unshelve uses HEAD^$n to find the parent commit, which
fails if there is an additional commit.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9832-unshelve.sh')
| -rwxr-xr-x | t/t9832-unshelve.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh index e9276c48f4..feda4499dd 100755 --- a/t/t9832-unshelve.sh +++ b/t/t9832-unshelve.sh @@ -29,8 +29,11 @@ test_expect_success 'init depot' ' ) ' +# Create an initial clone, with a commit unrelated to the P4 change +# on HEAD test_expect_success 'initial clone' ' - git p4 clone --dest="$git" //depot/@all + git p4 clone --dest="$git" //depot/@all && + test_commit -C "$git" "unrelated" ' test_expect_success 'create shelved changelist' ' @@ -77,7 +80,7 @@ EOF ) ' -test_expect_success 'update shelved changelist and re-unshelve' ' +test_expect_failure 'update shelved changelist and re-unshelve' ' test_when_finished cleanup_git && ( cd "$cli" && |