summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Luke Diamand <luke@diamand.org>2019-01-18 09:36:56 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-18 09:43:40 -0800
commit7a10946ab9dd4692fc99d219f0cd4bc3d5e16d63 (patch)
treeda5b63668c0eaea135389eb8dbc5aca90eb5520f /t
parentgit-p4: add failing test for shelved CL update involving move/copy (diff)
downloadtgif-7a10946ab9dd4692fc99d219f0cd4bc3d5e16d63.tar.xz
git-p4: handle update of moved/copied files when updating a shelve
Perforce requires a complete list of files being operated on. If git is updating an existing shelved changelist, then any files which are moved or copied were not being added to this list. Signed-off-by: Luke Diamand <luke@diamand.org> Acked-by: Andrey Mazo <amazo@checkvideo.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t9807-git-p4-submit.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index f94854d447..850d979119 100755
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -546,7 +546,7 @@ test_expect_success 'submit --update-shelve' '
)
'
-test_expect_failure 'update a shelve involving moved and copied files' '
+test_expect_success 'update a shelve involving moved and copied files' '
test_when_finished cleanup_git &&
(
cd "$cli" &&