summaryrefslogtreecommitdiff
path: root/t/t4103-apply-binary.sh
AgeCommit message (Collapse)AuthorFilesLines
2006-09-07Make apply --binary a no-op.Libravatar Junio C Hamano1-2/+2
Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so. This makes the flag a no-op by always allowing binary patch application. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-28t4103: fix binary patch application test.Libravatar Junio C Hamano1-2/+2
The generated binary patch was _not_ binary -- earlier I made the --full-index flag to imply binary patch generation to the diff machinery, but later we made it independent from --binary (although the latter implies the former). Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-19tests: make scripts executableLibravatar Junio C Hamano1-0/+0
just for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-16tests: binary diff application.Libravatar Junio C Hamano1-10/+39
This adds more tests to cover cases where binary diff application succeeds. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-16apply: allow-binary-replacement.Libravatar Junio C Hamano1-0/+8
A new option, --allow-binary-replacement, is introduced. When you feed a diff that records full SHA1 name of pre- and post-image blob on its index line to git-apply with this option, the post-image blob replaces the path if what you have in the working tree matches the pre-image _and_ post-image blob is already available in the object directory. Later we _might_ want to enhance the diff output to also include the full binary data of the post-image, to make this more useful, but this is good enough for local rebasing application. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-16git-apply: fail if a patch cannot be applied.Libravatar Junio C Hamano1-0/+78
Recently we fixed 'git-apply --stat' not to barf on a binary differences. But it accidentally broke the error detection when we actually attempt to apply them. This commit fixes the problem and adds test cases. Signed-off-by: Junio C Hamano <junkio@cox.net>