From: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru>
Date: Mon, 3 Mar 2014 22:31:52 +0000 (+0400)
Subject: commit.c: use ALLOC_GROW() in register_commit_graft()
X-Git-Tag: v2.0.0-rc0~97^2~10
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=d6e82b575a7dc16be03f67fc3c4b648bc18df09f;p=git.git

commit.c: use ALLOC_GROW() in register_commit_graft()

Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/commit.c b/commit.c
index 6bf4fe00d4..e0043144b1 100644
--- a/commit.c
+++ b/commit.c
@@ -147,12 +147,8 @@ int register_commit_graft(struct commit_graft *graft, int ignore_dups)
 		return 1;
 	}
 	pos = -pos - 1;
-	if (commit_graft_alloc <= ++commit_graft_nr) {
-		commit_graft_alloc = alloc_nr(commit_graft_alloc);
-		commit_graft = xrealloc(commit_graft,
-					sizeof(*commit_graft) *
-					commit_graft_alloc);
-	}
+	ALLOC_GROW(commit_graft, commit_graft_nr + 1, commit_graft_alloc);
+	commit_graft_nr++;
 	if (pos < commit_graft_nr)
 		memmove(commit_graft + pos + 1,
 			commit_graft + pos,