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

diff --combined git-p4.py
index 3e12774f96bb185bb6860290ad187c986ec7fa76,b1c262e13df4ce79c2bff2140b2c0ded7c0726da..5b79920f46a972437ff05966d042a84d44f050d9
--- 1/git-p4.py
--- 2/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)