development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-p4 unshelve: adding a commit breaks git-p4 unshelve

Browse source 
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>
This commit is contained in:
Luke Diamand 2020-09-19 09:54:40 +01:00 committed by Junio C Hamano
parent 47ae905ffb
commit 677fa8d115
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
t/t9832-unshelve.sh
View file

@ -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" &&