From 677fa8d1157c869974355e316d0e2349759d0325 Mon Sep 17 00:00:00 2001 From: Luke Diamand Date: Sat, 19 Sep 2020 09:54:40 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- t/t9832-unshelve.sh | 7 +++++-- 1 file 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" &&