diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-19 13:22:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-19 13:22:16 -0700 |
| commit | a63d31b4d3640960d9a71606eee80c32459f906e (patch) | |
| tree | f38215188f294761cbedca19d676e64a8788bd15 /diffcore-break.c | |
| parent | 63641fb07131bede8273c3b3057792c9dcf7356b (diff) | |
| parent | 09bdff29e1b73ce264c7ddc3e19e1269ee7c610e (diff) | |
| download | git-a63d31b4d3640960d9a71606eee80c32459f906e.tar.gz | |
Merge branch 'bc/cocci'
Conversion from unsigned char sha1[20] to struct object_id
continues.
* bc/cocci:
diff: convert prep_temp_blob() to struct object_id
merge-recursive: convert merge_recursive_generic() to object_id
merge-recursive: convert leaf functions to use struct object_id
merge-recursive: convert struct merge_file_info to object_id
merge-recursive: convert struct stage_data to use object_id
diff: rename struct diff_filespec's sha1_valid member
diff: convert struct diff_filespec to struct object_id
coccinelle: apply object_id Coccinelle transformations
coccinelle: convert hashcpy() with null_sha1 to hashclr()
contrib/coccinelle: add basic Coccinelle transforms
hex: add oid_to_hex_r()
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)) |