diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-05-08 01:39:29 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-05-08 01:39:29 +0400 |
commit | ccfa587787aa4f3f0990ae45af18b84b55e2c74e (patch) | |
tree | 4dfea9032aa4d2ca653224bd4f29c2bcc7e23efe | |
parent | 1c65d3b9d3987e9350859bc5c56a944287707d1f (diff) | |
parent | 749b668c7db563609de3de7595504f2dca8eef7d (diff) |
Merge branch 'cl/p4-use-diff-tree'
Fixes a regression in 1.9.0 with an obviously correct single-liner.
* cl/p4-use-diff-tree:
git-p4: format-patch to diff-tree change breaks binary patches
-rwxr-xr-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1311,7 +1311,7 @@ class P4Submit(Command, P4UserMap): else: die("unknown modifier %s for %s" % (modifier, path)) - diffcmd = "git diff-tree -p \"%s\"" % (id) + diffcmd = "git diff-tree --full-index -p \"%s\"" % (id) patchcmd = diffcmd + " | git apply " tryPatchCmd = patchcmd + "--check -" applyPatchCmd = patchcmd + "--check --apply -" |