summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-06-17 17:15:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-17 17:15:19 (GMT)
commitadd59c4708cd629a6ee3175f0e0a796cc9b6db28 (patch)
tree83364d0d985278fdf7dd9b729d8d8123b576c5e9 /git-p4.py
parentd4fdeed00639b27c45856dfef338d46ec60b419e (diff)
parentc3f2358de39a8ac754ae68880a992835a84a6f0c (diff)
downloadgit-add59c4708cd629a6ee3175f0e0a796cc9b6db28.zip
git-add59c4708cd629a6ee3175f0e0a796cc9b6db28.tar.gz
git-add59c4708cd629a6ee3175f0e0a796cc9b6db28.tar.bz2
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
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index 81a5258..c71a683 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