[PATCH v2 1/1] p4 unshelve: fix "Not a valid object name HEAD0" on Windows

From: Mike Mueller via GitGitGadget <gitgitgadget@gmail.com>
Date: May 28, 2019, 18:15 UTC
Message-ID: <5e89d1aceb9125231797a355e9465d1a41a1741c.1559067344.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.183.v2.git.gitgitgadget@gmail.com>

From: Mike Mueller <mike.mueller@moodys.com>

git p4 unshelve was failing with these errors:

fatal: Not a valid object name HEAD0 Command failed: git cat-file commit HEAD^0

(git version 2.21.0.windows.1, python 2.7.16)

The pOpen call used by git-p4 to invoke the git command can take either a string or an array as a first argument. The array form is preferred because platform-specific escaping of special characters will be handled automatically.(https://docs.python.org/2/library/subprocess.html) The extractLogMessageFromGitCommit method was, however, using the string form and so the caret (^) character in the HEAD^0 argument was not being escaped on Windows. The caret happens to be the escape character, which is why the git command was receiving HEAD0.

The behaviour can be confirmed by typing ECHO HEAD^0 at the command- prompt, which emits HEAD0.

The solution is simply to use the array format of passing the command to fOpen, which is recommended and used in other parts of this code anyway.

Signed-off-by: Mike Mueller <mike.mueller@moodys.com>
---
 git-p4.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

-- 
gitgitgadget