Merge branch 'cl/p4-use-diff-tree' into maint

"git p4" dealing with changes in binary files were broken by a
change in 1.9 release.

* 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-08 10:01:32 -07:00
Родитель 6eca9c0e87 749b668c7d
Коммит bd51339355
1 изменённых файлов: 1 добавлений и 1 удалений

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

@ -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 -"