From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 5 Feb 2019 22:26:10 +0000 (-0800)
Subject: Merge branch 'ld/git-p4-shelve-update-fix'
X-Git-Tag: v2.21.0-rc0~53
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/40b8ba2c4458bd1ed6d32092712c07a4fc26e256?ds=inline;hp=-c

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
---

40b8ba2c4458bd1ed6d32092712c07a4fc26e256
diff --combined git-p4.py
index 3e12774f96,b1c262e13d..5b79920f46
--- a/git-p4.py
+++ b/git-p4.py
@@@ -332,8 -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))
  
@@@ -1861,6 -1859,7 +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 -1876,7 +1878,7 @@@
                  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)