global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 18:33:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint' of git://repo.or.cz/alt-git

Browse Source
This commit is contained in:
Johannes Sixt
2007-06-25 15:35:36 +02:00
parent 16c1568546 c7c84859ad
commit ec96b992e0
46 changed files with 1173 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
diff.c
View File

@@ -1108,10 +1108,8 @@ static void setup_diff_attr_check(struct git_attr_check *check)
check->attr = attr_diff;
}
#define FIRST_FEW_BYTES 8000
static int file_is_binary(struct diff_filespec *one)
{
unsigned long sz;
struct git_attr_check attr_diff_check;
setup_diff_attr_check(&attr_diff_check);
@@ -1128,10 +1126,7 @@ static int file_is_binary(struct diff_filespec *one)
return 0;
diff_populate_filespec(one, 0);
}
sz = one->size;
if (FIRST_FEW_BYTES < sz)
sz = FIRST_FEW_BYTES;
return !!memchr(one->data, 0, sz);
return buffer_is_binary(one->data, one->size);
}
static void builtin_diff(const char *name_a,