From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jul 2019 21:27:11 +0000 (-0700)
Subject: Merge branch 'mm/p4-unshelve-windows-fix' into maint
X-Git-Tag: v2.23.0-rc0~6^2~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0eb2774b25641d797ffb09a884b85e93a6563648?hp=7a779ca2f89a33f405029ac30891cec769b08d2e

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

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

diff --git a/git-p4.py b/git-p4.py
index 5b79920f46..0b5bfcbc5e 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -737,7 +737,7 @@ def extractLogMessageFromGitCommit(commit):
 
     ## 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