Merge branch 'mm/p4-unshelve-windows-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2019 17:15:19 +0000 (10:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2019 17:15:19 +0000 (10:15 -0700)
The command line to invoke a "git cat-file" command from inside
"git p4" was not properly quoted to protect a caret and running a
broken command on Windows, which has been corrected.

* mm/p4-unshelve-windows-fix:
p4 unshelve: fix "Not a valid object name HEAD0" on Windows

1  2 
git-p4.py
diff --combined git-p4.py
index 81a525858bf2229477f5222cc73869785b6daa0c,0b5bfcbc5e3f9db6f60848069cb62db0694fa5e5..c71a6832e2fa0a632dc93155d0fa2b727c659f5e
+++ b/git-p4.py
@@@ -737,7 -737,7 +737,7 @@@ def extractLogMessageFromGitCommit(comm
  
      ## fixme: title is first line of commit, not 1st paragraph.
      foundTitle = False
-     for log in read_pipe_lines("git cat-file commit %s" % commit):
+     for log in read_pipe_lines(["git", "cat-file", "commit", commit]):
         if not foundTitle:
             if len(log) == 1:
                 foundTitle = True
@@@ -1309,7 -1309,7 +1309,7 @@@ class GitLFS(LargeFileSystem)
  
  class Command:
      delete_actions = ( "delete", "move/delete", "purge" )
 -    add_actions = ( "add", "move/add" )
 +    add_actions = ( "add", "branch", "move/add" )
  
      def __init__(self):
          self.usage = "usage: %prog [options]"