From: Linus Torvalds Date: Sat, 18 Aug 2007 22:52:55 +0000 (-0700) Subject: Take binary diffs into account for "git rebase" X-Git-Tag: v1.5.3-rc6~9 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2f82f760e1b2630073a05c44fe70bdce9706d9e5;p=git.git 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 Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- diff --git a/diff.c b/diff.c index 97cc5bc08..a7e76719d 100644 --- a/diff.c +++ b/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) 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)