Merge branch 'jk/oideq-hasheq-cleanup'

gitster · gitster · commit ee56992a8792 · 2018-10-16T16:16:08.000+09:00
Code clean-up.

* jk/oideq-hasheq-cleanup:
  more oideq/hasheq conversions
diff --git a/builtin/checkout.c b/builtin/checkout.c
@@ -497,7 +497,8 @@ static int skip_merge_working_tree(const struct checkout_opts *opts,
 	 * We must do the merge if we are actually moving to a new commit.
 	 */
 	if (!old_branch_info->commit || !new_branch_info->commit ||
-		oidcmp(&old_branch_info->commit->object.oid, &new_branch_info->commit->object.oid))
+		!oideq(&old_branch_info->commit->object.oid,
+		       &new_branch_info->commit->object.oid))
 		return 0;
 
 	/*
diff --git a/cache-tree.c b/cache-tree.c
@@ -781,7 +781,7 @@ static void verify_one(struct index_state *istate,
 		strbuf_add(&tree_buf, oid->hash, the_hash_algo->rawsz);
 	}
 	hash_object_file(tree_buf.buf, tree_buf.len, tree_type, &new_oid);
-	if (oidcmp(&new_oid, &it->oid))
+	if (!oideq(&new_oid, &it->oid))
 		BUG("cache-tree for path %.*s does not match. "
 		    "Expected %s got %s", len, path->buf,
 		    oid_to_hex(&new_oid), oid_to_hex(&it->oid));
diff --git a/commit-reach.c b/commit-reach.c
@@ -426,7 +426,7 @@ struct contains_stack {
 static int in_commit_list(const struct commit_list *want, struct commit *c)
 {
 	for (; want; want = want->next)
-		if (!oidcmp(&want->item->object.oid, &c->object.oid))
+		if (oideq(&want->item->object.oid, &c->object.oid))
 			return 1;
 	return 0;
 }
diff --git a/midx.c b/midx.c
@@ -282,8 +282,8 @@ static int nth_midxed_pack_entry(struct multi_pack_index *m, struct pack_entry *
 		struct object_id oid;
 		nth_midxed_object_oid(&oid, m, pos);
 		for (i = 0; i < p->num_bad_objects; i++)
-			if (!hashcmp(oid.hash,
-				     p->bad_object_sha1 + the_hash_algo->rawsz * i))
+			if (hasheq(oid.hash,
+				   p->bad_object_sha1 + the_hash_algo->rawsz * i))
 				return 0;
 	}
 
@@ -580,8 +580,8 @@ static struct pack_midx_entry *get_sorted_entries(struct multi_pack_index *m,
 		 * Take only the first duplicate.
 		 */
 		for (cur_object = 0; cur_object < nr_fanout; cur_object++) {
-			if (cur_object && !oidcmp(&entries_by_fanout[cur_object - 1].oid,
-						  &entries_by_fanout[cur_object].oid))
+			if (cur_object && oideq(&entries_by_fanout[cur_object - 1].oid,
+						&entries_by_fanout[cur_object].oid))
 				continue;
 
 			ALLOC_GROW(deduplicated_entries, *nr_objects + 1, alloc_objects);

Original file line number	Diff line number	Diff line change
`@@ -781,7 +781,7 @@ static void verify_one(struct index_state *istate,`
`781`	`781`	`strbuf_add(&tree_buf, oid->hash, the_hash_algo->rawsz);`
`782`	`782`	`}`
`783`	`783`	`hash_object_file(tree_buf.buf, tree_buf.len, tree_type, &new_oid);`
`784`		`- if (oidcmp(&new_oid, &it->oid))`
	`784`	`+ if (!oideq(&new_oid, &it->oid))`
`785`	`785`	`BUG("cache-tree for path %.*s does not match. "`
`786`	`786`	`"Expected %s got %s", len, path->buf,`
`787`	`787`	`oid_to_hex(&new_oid), oid_to_hex(&it->oid));`
Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ struct contains_stack {`
`426`	`426`	`static int in_commit_list(const struct commit_list want, struct commit c)`
`427`	`427`	`{`
`428`	`428`	`for (; want; want = want->next)`
`429`		`- if (!oidcmp(&want->item->object.oid, &c->object.oid))`
	`429`	`+ if (oideq(&want->item->object.oid, &c->object.oid))`
`430`	`430`	`return 1;`
`431`	`431`	`return 0;`
`432`	`432`	`}`