зеркало из https://github.com/microsoft/git.git
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:
Коммит
bd51339355
|
@ -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 -"
|
||||
|
|
Загрузка…
Ссылка в новой задаче