summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-18 13:50:21 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-18 13:50:21 -0700
commitfe9122a35213827348c521a16ffd0cf2652c4ac5 (patch)
tree7feb62b93a1b90ad365f582e926c11b75d847686 /commit.c
parenta8e1d711cc9531463fe312875553d56624eb9c37 (diff)
parentc7353967ca8ede681e9f8fbac98a650450631990 (diff)
downloadgit-fe9122a35213827348c521a16ffd0cf2652c4ac5.tar.gz
Merge branch 'dd/use-alloc-grow'
Replace open-coded reallocation with ALLOC_GROW() macro. * dd/use-alloc-grow: sha1_file.c: use ALLOC_GROW() in pretend_sha1_file() read-cache.c: use ALLOC_GROW() in add_index_entry() builtin/mktree.c: use ALLOC_GROW() in append_to_tree() attr.c: use ALLOC_GROW() in handle_attr_line() dir.c: use ALLOC_GROW() in create_simplify() reflog-walk.c: use ALLOC_GROW() replace_object.c: use ALLOC_GROW() in register_replace_object() patch-ids.c: use ALLOC_GROW() in add_commit() diffcore-rename.c: use ALLOC_GROW() diff.c: use ALLOC_GROW() commit.c: use ALLOC_GROW() in register_commit_graft() cache-tree.c: use ALLOC_GROW() in find_subtree() bundle.c: use ALLOC_GROW() in add_to_ref_list() builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/commit.c b/commit.c
index a263947383..0f28902bc3 100644
--- a/commit.c
+++ b/commit.c
@@ -141,12 +141,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,