[2/2] git-p4: handle update of moved files when updating a shelve
diff mbox series

Message ID 20190113135815.11286-3-luke@diamand.org
State New
Headers show
Series
  • git-p4: handle moved files when updating a P4 shelve
Related show

Commit Message

Luke Diamand Jan. 13, 2019, 1:58 p.m. UTC
Perforce requires a complete list of files being operated on. If
git is updating an existing shelved changelist, then any files
which are moved were not being added to this list.

Signed-off-by: Luke Diamand <luke@diamand.org>
---
 git-p4.py                | 1 +
 t/t9807-git-p4-submit.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Patch
diff mbox series

diff --git a/git-p4.py b/git-p4.py
index 1998c3e141..20c5ce9903 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1875,6 +1875,7 @@  def applyCommit(self, id):
                 editedFiles.add(dest)
             elif modifier == "R":
                 src, dest = diff['src'], diff['dst']
+                all_files.append(dest)
                 if self.p4HasMoveCommand:
                     p4_edit(src)        # src must be open before move
                     p4_move(src, dest)  # opens for (move/delete, move/add)
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index 08dc8d2caf..4d5ea9e64c 100755
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -548,7 +548,7 @@  test_expect_success 'submit --update-shelve' '
 	)
 '
 
-test_expect_failure 'update a shelve involving a moved file' '
+test_expect_success 'update a shelve involving a moved file' '
 	test_when_finished cleanup_git &&
 	(
 		cd "$cli" &&