summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-02-05 22:26:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-05 22:26:10 (GMT)
commit40b8ba2c4458bd1ed6d32092712c07a4fc26e256 (patch)
tree7cef01f10ba730dc3f781fe49445581710ed4d8d /git-p4.py
parent09b2e40944f297d6cabe0fb0ce2e3a72e610f657 (diff)
parent7a10946ab9dd4692fc99d219f0cd4bc3d5e16d63 (diff)
downloadgit-40b8ba2c4458bd1ed6d32092712c07a4fc26e256.zip
git-40b8ba2c4458bd1ed6d32092712c07a4fc26e256.tar.gz
git-40b8ba2c4458bd1ed6d32092712c07a4fc26e256.tar.bz2
Merge branch 'ld/git-p4-shelve-update-fix'
"git p4" failed to update a shelved change when there were moved files, which has been corrected. * ld/git-p4-shelve-update-fix: git-p4: handle update of moved/copied files when updating a shelve git-p4: add failing test for shelved CL update involving move/copy
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-p4.py b/git-p4.py
index 3e12774..5b79920 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1861,6 +1861,7 @@ class P4Submit(Command, P4UserMap):
filesToAdd.remove(path)
elif modifier == "C":
src, dest = diff['src'], diff['dst']
+ all_files.append(dest)
p4_integrate(src, dest)
pureRenameCopy.add(dest)
if diff['src_sha1'] != diff['dst_sha1']:
@@ -1877,6 +1878,7 @@ class P4Submit(Command, P4UserMap):
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)