]> git.ipfire.org Git - thirdparty/git.git/commit - diff.c
show_dirstat: simplify same-content check
authorJeff King <peff@peff.net>
Tue, 28 Aug 2018 21:23:03 +0000 (17:23 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2018 18:32:49 +0000 (11:32 -0700)
commitd9f62dfa0ddc31bdad93054acca9fd42ca781f7f
tree6fd09fd6fcb441b0e494c8439732bd682f4edda3
parent6a29d7b7a72c7b131ae3cda9e0b47b67a27a51f1
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>
diff.c