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 'master' of git://repo.or.cz/alt-git

Browse Source
This commit is contained in:
Johannes Sixt
2007-08-29 13:08:45 +02:00
parent fce4254719 99c7ff3525
commit a703dc4069
74 changed files with 1797 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
diff.c
View File

@@ -2914,10 +2914,6 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
fill_mmfile(&mf2, p->two) < 0)
return error("unable to read files to diff");
/* Maybe hash p->two? into the patch id? */
if (diff_filespec_is_binary(p->two))
continue;
len1 = remove_space(p->one->path, strlen(p->one->path));
len2 = remove_space(p->two->path, strlen(p->two->path));
if (p->one->mode == 0)