4 commits

Author	SHA1	Message	Date
Junio C Hamano	1fdfd05db2	tests: make scripts executable ... just for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-12-19 18:27:04 -08:00
Junio C Hamano	fbba222f5d	tests: binary diff application. ... This adds more tests to cover cases where binary diff application succeeds. Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-11-16 16:20:41 -08:00
Junio C Hamano	011f4274bb	apply: allow-binary-replacement. ... 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-16 16:20:40 -08:00
Junio C Hamano	92927ed0aa	git-apply: fail if a patch cannot be applied. ... 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>	2005-11-16 14:12:56 -08:00