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
This commit is contained in:
Junio C Hamano 2014-05-07 14:39:29 -07:00
Родитель 1c65d3b9d3 749b668c7d
Коммит ccfa587787
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -1311,7 +1311,7 @@ class P4Submit(Command, P4UserMap):
else: else:
die("unknown modifier %s for %s" % (modifier, path)) 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 " patchcmd = diffcmd + " | git apply "
tryPatchCmd = patchcmd + "--check -" tryPatchCmd = patchcmd + "--check -"
applyPatchCmd = patchcmd + "--check --apply -" applyPatchCmd = patchcmd + "--check --apply -"