Skip to content

Commit ca2c63d

Browse files
committed
Merge branch 'mm/p4-unshelve-windows-fix' into jch
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
2 parents 05f80d0 + c3f2358 commit ca2c63d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-p4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ def extractLogMessageFromGitCommit(commit):
737737

738738
## fixme: title is first line of commit, not 1st paragraph.
739739
foundTitle = False
740-
for log in read_pipe_lines("git cat-file commit %s" % commit):
740+
for log in read_pipe_lines(["git", "cat-file", "commit", commit]):
741741
if not foundTitle:
742742
if len(log) == 1:
743743
foundTitle = True

0 commit comments

Comments
 (0)