From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Jun 2019 17:15:19 +0000 (-0700)
Subject: Merge branch 'mm/p4-unshelve-windows-fix'
X-Git-Tag: v2.23.0-rc0~109
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/add59c4708cd629a6ee3175f0e0a796cc9b6db28?ds=inline;hp=-c

Merge branch 'mm/p4-unshelve-windows-fix'

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

add59c4708cd629a6ee3175f0e0a796cc9b6db28
diff --combined git-p4.py
index 81a525858b,0b5bfcbc5e..c71a6832e2
--- a/git-p4.py
+++ 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]"