mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Take binary diffs into account for "git rebase"
We used to not generate a patch ID for binary diffs, but that means that some commits may be skipped as being identical to already-applied diffs when doing a rebase. So just delete the code that skips the binary diff. At the very least, we'd want the filenames to be part of the patch ID, but we might also want to generate some hash for the binary diff itself too. This fixes an issue noticed by Torgil Svensson. Tested-by: Torgil Svensson <torgil.svensson@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
1211be6bed
commit
2f82f760e1
4
diff.c
4
diff.c
|
@ -2919,10 +2919,6 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
|
||||||
fill_mmfile(&mf2, p->two) < 0)
|
fill_mmfile(&mf2, p->two) < 0)
|
||||||
return error("unable to read files to diff");
|
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));
|
len1 = remove_space(p->one->path, strlen(p->one->path));
|
||||||
len2 = remove_space(p->two->path, strlen(p->two->path));
|
len2 = remove_space(p->two->path, strlen(p->two->path));
|
||||||
if (p->one->mode == 0)
|
if (p->one->mode == 0)
|
||||||
|
|
Loading…
Reference in a new issue