X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=git-p4.py;h=5b79920f46a972437ff05966d042a84d44f050d9;hb=8f0f46539a8c557985241f3aec7a12bd5f2634c2;hp=1998c3e141bec5142032f08623b916d7741e64ac;hpb=d95f610c64b9b33957beaa1da60a489d0b4aa7fc;p=thirdparty%2Fgit.git

diff --git a/git-p4.py b/git-p4.py
index 1998c3e141..5b79920f46 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -332,6 +332,8 @@ def p4_check_access(min_expiration=1):
             die_bad_access("p4 error: {0}".format(data))
         else:
             die_bad_access("unknown error")
+    elif code == "info":
+        return
     else:
         die_bad_access("unknown error code {0}".format(code))
 
@@ -1859,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']:
@@ -1875,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)