diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:39:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:39:38 -0700 |
| commit | 49981d8a250837019b4a14f44d471fc6ff7e334f (patch) | |
| tree | c3394268eaaade296d7de692fe7e76bacb3be97b /diffcore-break.c | |
| parent | 0202c411edc25940cc381bf317badcdf67670be4 (diff) | |
| parent | 6ebdac1bab966b720d776aa43ca188fe378b1f4b (diff) | |
| download | git-49981d8a250837019b4a14f44d471fc6ff7e334f.tar.xz | |
Start maintenance track for 2.10.x series
Diffstat (limited to 'diffcore-break.c')
| -rw-r--r-- | diffcore-break.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore-break.c b/diffcore-break.c index 5473493e10..881a74f29e 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -57,8 +57,8 @@ static int should_break(struct diff_filespec *src, return 1; /* even their types are different */ } - if (src->sha1_valid && dst->sha1_valid && - !hashcmp(src->sha1, dst->sha1)) + if (src->oid_valid && dst->oid_valid && + !oidcmp(&src->oid, &dst->oid)) return 0; /* they are the same */ if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0)) |