commit 5e50c36a5afdc25a5118410cbfa5f8e89c800f3a
from: Stefan Sperling <stsp@stsp.name>
date: Thu Nov 08 18:09:08 2018 UTC

remove premature optimization which resulted in buggy logic

commit - b9c339262887ab888b0c1b714d9a7b13ea0c945b
commit + 5e50c36a5afdc25a5118410cbfa5f8e89c800f3a
blob - ece10ade50184d169a6412a4e89397a44d86b5eb
blob + 845e5be5f5dfcfc507ff3ee24b71d2873b0e0408
--- lib/commit_graph.c
+++ lib/commit_graph.c
@@ -36,10 +36,6 @@
 #include "got_lib_object_idset.h"
 #include "got_lib_path.h"
 
-#ifndef MIN
-#define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
-#endif
-
 struct got_commit_graph_node {
 	struct got_object_id id;
 
@@ -96,8 +92,7 @@ struct got_commit_graph {
 
 	/* Array of branch tips for fetch_commits_from_open_branches(). */
 	struct got_commit_graph_branch_tip *tips;
-	size_t ntips;
-#define GOT_COMMIT_GRAPH_MIN_TIPS 10	/* minimum amount of tips to allocate */
+	int ntips;
 
 	/* Path of tree entry of interest to the API user. */
 	char *path;
@@ -547,8 +542,8 @@ fetch_commits_from_open_branches(int *nfetched,
 	/* (Re-)allocate branch tips array if necessary. */
 	if (graph->ntips < ntips) {
 		struct got_commit_graph_branch_tip *tips;
-		tips = reallocarray(graph->tips,
-		    MIN(ntips, GOT_COMMIT_GRAPH_MIN_TIPS), sizeof(*tips));
+		tips = recallocarray(graph->tips, graph->ntips, ntips,
+		    sizeof(*tips));
 		if (tips == NULL)
 			return got_error_from_errno();
 		graph->tips = tips;