summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Brandon Williams <bmwill@google.com>2017-04-28 16:53:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-01 12:18:38 +0900
commit610b233704638372834777ebf6ed3ab8829ec259 (patch)
treefc0150143fe1a97acad3dd928011a5911cf97967
parentsubmodule: rename add_sha1_to_array() (diff)
downloadtgif-610b233704638372834777ebf6ed3ab8829ec259.tar.xz
submodule: rename free_submodules_sha1s()
Rename 'free_submodules_sha1s()' to 'free_submodules_oids()' since the function frees a 'struct string_list' which has a 'struct oid_array' stored in the 'util' field. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--submodule.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c
index be0f5d8478..46abd52b14 100644
--- a/submodule.c
+++ b/submodule.c
@@ -738,7 +738,7 @@ static void find_unpushed_submodule_commits(struct commit *commit,
diff_tree_combined_merge(commit, 1, &rev);
}
-static void free_submodules_sha1s(struct string_list *submodules)
+static void free_submodules_oids(struct string_list *submodules)
{
struct string_list_item *item;
for_each_string_list_item(item, submodules)
@@ -779,7 +779,8 @@ int find_unpushed_submodules(struct oid_array *commits,
if (submodule_needs_pushing(submodule->string, commits))
string_list_insert(needs_pushing, submodule->string);
}
- free_submodules_sha1s(&submodules);
+
+ free_submodules_oids(&submodules);
return needs_pushing->nr;
}