diff options
| author |  Tolga Ceylan <tolga.ceylan@gmail.com> | 2014-05-06 22:48:54 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-05-07 10:27:22 -0700 |
| commit | 749b668c7db563609de3de7595504f2dca8eef7d (patch) | |
| tree | 4f20dfc8556c8820771420e9b2aa3ca5c57d4706 /wildmatch.h | |
| parent | git p4: Use git diff-tree instead of format-patch (diff) | |
| download | tgif-749b668c7db563609de3de7595504f2dca8eef7d.tar.xz | |
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>
Diffstat (limited to 'wildmatch.h')
0 files changed, 0 insertions, 0 deletions