4 Commits

Author	SHA1	Message	Date
Junio C Hamano	d6958a1a32	Merge branch 'maint-1.5.4' into maint ... * maint-1.5.4: svn-git: Use binmode for reading/writing binary rev maps diff options documentation: refer to --diff-filter in --name-status git-svn bug with blank commits and author file archive.c: format_subst - fixed bogus argument to memchr copy.c: copy_fd - correctly report write errors gitattributes: Fix subdirectory attributes specified from root directory	2008-04-22 23:37:06 -07:00
Matthew Ogilvie	82881b3823	gitattributes: Fix subdirectory attributes specified from root directory ... Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-04-22 21:12:37 -07:00
Jeff King	82ebb0b6ec	add test_cmp function for test scripts ... Many scripts compare actual and expected output using "diff -u". This is nicer than "cmp" because the output shows how the two differ. However, not all versions of diff understand -u, leading to unnecessary test failure. This adds a test_cmp function to the test scripts and switches all "diff -u" invocations to use it. The function uses the contents of "$GIT_TEST_CMP" to compare its arguments; the default is "diff -u". On systems with a less-capable diff, you can do: GIT_TEST_CMP=cmp make test Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-03-13 00:57:52 -07:00
Junio C Hamano	cf94ccda35	gitattributes: fix relative path matching ... There was an embarrassing pair of off-by-one miscounting that failed to match path "a/b/c" when "a/.gitattributes" tried to name it with relative path "b/c". This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-02-07 00:04:50 -08:00