diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-26 00:27:11 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-26 00:27:11 +0300 |
commit | 0eb2774b25641d797ffb09a884b85e93a6563648 (patch) | |
tree | 98b8d8b4078cc8922f9abc9374c04760a7636475 | |
parent | 7a779ca2f89a33f405029ac30891cec769b08d2e (diff) | |
parent | c3f2358de39a8ac754ae68880a992835a84a6f0c (diff) |
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
-rwxr-xr-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |