diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2007-08-18 15:52:55 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-08-19 11:45:31 -0700 |
| commit | 2f82f760e1b2630073a05c44fe70bdce9706d9e5 (patch) | |
| tree | 708453d64796eb617cb8a1602959e00356693315 | |
| parent | Make thin-pack generation subproject aware. (diff) | |
| download | tgif-2f82f760e1b2630073a05c44fe70bdce9706d9e5.tar.xz | |
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>
| -rw-r--r-- | diff.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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) |