| commit | 749b668c7db563609de3de7595504f2dca8eef7d | |
| author | Tolga Ceylan <tolga.ceylan@gmail.com> | |
| Wed, 7 May 2014 05:48:54 +0000 (6 22:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 May 2014 17:27:22 +0000 (7 10:27 -0700) | ||
| tree | 4f20dfc8556c8820771420e9b2aa3ca5c57d4706 | treesnapshot (tar.gz zip) |
| parent | 109efbe4f24b1748f42af52ca6d528b2d7ffe048 | commitdiff |
git-p4: format-patch to diff-tree change breaks binary patches
When applying binary patches a full index is required. format-patch
already handles this, but diff-tree needs '--full-index' argument
to always output full index. When git-p4 runs git-apply to test
the patch, git-apply rejects the patch due to abbreviated blob
object names. This is the error message git-apply emits in this
case:
error: cannot apply binary patch to '<filename>' without full index line
error: <filename>: patch does not apply
Signed-off-by: Tolga Ceylan <tolga.ceylan@gmail.com>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When applying binary patches a full index is required. format-patch
already handles this, but diff-tree needs '--full-index' argument
to always output full index. When git-p4 runs git-apply to test
the patch, git-apply rejects the patch due to abbreviated blob
object names. This is the error message git-apply emits in this
case:
error: cannot apply binary patch to '<filename>' without full index line
error: <filename>: patch does not apply
Signed-off-by: Tolga Ceylan <tolga.ceylan@gmail.com>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-p4.py | diffblobblamehistory |