diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-12-12 14:18:20 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-12-12 14:18:20 -0800 |
commit | feb28ad0a87198b8ac0f2060dcfc8698bb1a67cf (patch) | |
tree | fa2dcac6100b2acdb7a9613e37238feeb03fd3e7 /git-p4.py | |
parent | 3497717941f9420d68d4191d79a9f2faf92f2fa5 (diff) | |
parent | 109efbe4f24b1748f42af52ca6d528b2d7ffe048 (diff) | |
download | git-feb28ad0a87198b8ac0f2060dcfc8698bb1a67cf.tar.gz |
Merge branch 'cl/p4-use-diff-tree'
* cl/p4-use-diff-tree:
git p4: Use git diff-tree instead of format-patch
Diffstat (limited to 'git-p4.py')
-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 format-patch -k --stdout \"%s^\"..\"%s\"" % (id, id) + diffcmd = "git diff-tree -p \"%s\"" % (id) patchcmd = diffcmd + " | git apply " tryPatchCmd = patchcmd + "--check -" applyPatchCmd = patchcmd + "--check --apply -" |