commit 196afc439c0eb4070ab6fe89b7d11748370dbffa
author Junio C Hamano <gitster@pobox.com> Wed Nov 21 22:58:08 2018 +0900
committer Junio C Hamano <gitster@pobox.com> Wed Nov 21 22:58:08 2018 +0900
tree 8759cbb508048172c9d27325266e64f95590ef29
parent eba14167f1354a0bbe2c7ec44d37f5a950b6a2f7
parent b84c7838829f997e0a0028b678b7ae8f7a21cc62

Merge branch 'jc/cocci-preincr' into maint

Code cleanup.

* jc/cocci-preincr:
  fsck: s/++i > 1/i++/
  cocci: simplify "if (++u > 1)" to "if (u++)"

contrib/coccinelle/preincr.cocci

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++

fsck.c

diff --git a/fsck.c b/fsck.c
index 0f56977..d44c46c 100644
--- a/fsck.c
+++ b/fsck.c
@@ -485,7 +485,7 @@
 		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)