summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-30 06:43:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-30 06:43:48 (GMT)
commitda3e0752cdfe7ae535b4e740f162f1e4926d4201 (patch)
tree6c2f666dc5962b86db4ffe24532f06870b57ba4f
parent67224b7b5a51223e933467204d077c658b367b42 (diff)
parentb84c7838829f997e0a0028b678b7ae8f7a21cc62 (diff)
downloadgit-da3e0752cdfe7ae535b4e740f162f1e4926d4201.zip
git-da3e0752cdfe7ae535b4e740f162f1e4926d4201.tar.gz
git-da3e0752cdfe7ae535b4e740f162f1e4926d4201.tar.bz2
Merge branch 'jc/cocci-preincr'
Code cleanup. * jc/cocci-preincr: fsck: s/++i > 1/i++/ cocci: simplify "if (++u > 1)" to "if (u++)"
-rw-r--r--contrib/coccinelle/preincr.cocci5
-rw-r--r--fsck.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/contrib/coccinelle/preincr.cocci b/contrib/coccinelle/preincr.cocci
new file mode 100644
index 0000000..7fe1e8d
--- /dev/null
+++ b/contrib/coccinelle/preincr.cocci
@@ -0,0 +1,5 @@
+@ preincrement @
+identifier i;
+@@
+- ++i > 1
++ i++
diff --git a/fsck.c b/fsck.c
index 38624d2..68502ce 100644
--- a/fsck.c
+++ b/fsck.c
@@ -479,7 +479,7 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
if (name) {
struct object *obj = &parents->item->object;
- if (++counter > 1)
+ if (counter++)
put_object_name(options, obj, "%s^%d",
name, counter);
else if (generation > 0)