show_dirstat: simplify same-content check
We use two nested conditionals to store a content_changed variable, but only bother to look at the result once, directly after we set it. We can drop the variable entirely and just use a single "if". This needless complexity is the result of 2ff3a80334 (Teach --dirstat not to completely ignore rearranged lines within a file, 2011-04-11). Before that, we held onto the content_changed variable much longer. While we're touching the condition, we can swap out oidcmp() for !oideq(). Our coccinelle patches didn't previously find this case because of the intermediate variable, but now it's a simple boolean in a conditional. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Aug 28, 2018 at 17:23 UTC
d9f62dfa0ddc31bdad93054acca9fd42ca781f7f
1 file changed
+3
-8
diff.c
+3
-8
@@ -2933,16 +2933,11 @@ static void show_dirstat(struct diff_options *options)
2933
struct diff_filepair *p = q->queue[i];
2934
const char *name;
2935
unsigned long copied, added, damage;
2936
- int content_changed;
2936
2937
name = p->two->path ? p->two->path : p->one->path;
2938
2940
- if (p->one->oid_valid && p->two->oid_valid)
2941
- content_changed = oidcmp(&p->one->oid, &p->two->oid);
2942
- else
2943
- content_changed = 1;
2944
-
2945
- if (!content_changed) {
2939
+ if (p->one->oid_valid && p->two->oid_valid &&
2940
+ oideq(&p->one->oid, &p->two->oid)) {
2941
/*
2942
* The SHA1 has not changed, so pre-/post-content is
2943
* identical. We can therefore skip looking at the
@@ -2989,7 +2984,7 @@ static void show_dirstat(struct diff_options *options)
2984
* made to the preimage.
2985
* If the resulting damage is zero, we know that
2986
* diffcore_count_changes() considers the two entries to
2992
- * be identical, but since content_changed is true, we
2987
+ * be identical, but since the oid changed, we
2988
* know that there must have been _some_ kind of change,
2989
* so we force all entries to have damage > 0.
2990
*/