Merge branch 'jc/cocci-preincr'

gitster · gitster · commit da3e0752cdfe · 2018-10-30T15:43:48.000+09:00
Code cleanup.

* jc/cocci-preincr:
  fsck: s/++i &gt; 1/i++/
  cocci: simplify "if (++u &gt; 1)" to "if (u++)"
diff --git a/contrib/coccinelle/preincr.cocci b/contrib/coccinelle/preincr.cocci
@@ -0,0 +1,5 @@
+@ preincrement @
+identifier i;
+@@
+- ++i > 1
++ i++
diff --git 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)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +@ preincrement @
 +identifier i;
 +@@
 +- ++i > 1
 ++ i++