tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2007-12-17	the use of 'tr' in the test suite isn't really portable	H.Merijn Brand	1	-2/+2
	Some versions of 'tr' only accept octal codes if entered with three digits, and therefor misinterpret the '\0' in the test suite. Some versions of 'tr' reject the (needless) use of character classes. Signed-off-by: H.Merijn Brand <h.m.brand@xs4all.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-02	Rewrite "git-frotz" to "git frotz"	Junio C Hamano	1	-26/+26
	This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
2006-09-07	Make apply --binary a no-op.	Junio C Hamano	1	-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-28	t4103: fix binary patch application test.	Junio C Hamano	1	-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-19	tests: make scripts executable	Junio C Hamano	1	-0/+0
	just for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-16	tests: binary diff application.	Junio C Hamano	1	-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-16	apply: allow-binary-replacement.	Junio C Hamano	1	-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-16	git-apply: fail if a patch cannot be applied.	Junio C Hamano	1	-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>