| commit | ff36de0847768873cc793afd6378d3b229591436 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 9 Nov 2005 22:59:23 +0000 (9 14:59 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 9 Nov 2005 23:19:50 +0000 (9 15:19 -0800) | ||
| tree | 570356837b65fbeaff2fe2ee57ff23dffc534eeb | treesnapshot (tar.gz zip) |
| parent | c44922a7817398d63bb2b46dc599bd05c710e746 | commitdiff |
git-apply: do not fail on binary diff when not applying nor checking.
We run git-apply with --stat and --summary at the end of the pull
by default, which causes it to barf when the pull brought in changes
to binary files. Just mark them as binary patch and proceed when
not applying nor checking.
[jc: I almost missed --check until I saw Linus did something similar.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
We run git-apply with --stat and --summary at the end of the pull
by default, which causes it to barf when the pull brought in changes
to binary files. Just mark them as binary patch and proceed when
not applying nor checking.
[jc: I almost missed --check until I saw Linus did something similar.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
| apply.c | diffblobblamehistory |