aboutsummaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-09-26 08:00:29 -0400
committerJunio C Hamano <gitster@pobox.com>2016-09-26 11:46:41 -0700
commit16ddcd403bdd74f47f3ae1a7e58a01e36e54a7d7 (patch)
treeb4d5e1936a7d013ef20107a1e4901650ea38d1df /submodule.c
parent0c99171ad2f79430eb81214d3f1d8ced3d3621e3 (diff)
downloadgit-16ddcd403bdd74f47f3ae1a7e58a01e36e54a7d7.tar.gz
git-16ddcd403bdd74f47f3ae1a7e58a01e36e54a7d7.tar.xz
sha1_array: let callbacks interrupt iteration
The callbacks for iterating a sha1_array must have a void return. This is unlike our usual for_each semantics, where a callback may interrupt iteration and have its value propagated. Let's switch it to the usual form, which will enable its use in more places (e.g., where we are replacing an existing iteration with a different data structure). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
-rw-r--r--submodule.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c
index 0ef2ff432..aba94dd07 100644
--- a/submodule.c
+++ b/submodule.c
@@ -728,9 +728,10 @@ void check_for_new_submodule_commits(unsigned char new_sha1[20])
sha1_array_append(&ref_tips_after_fetch, new_sha1);
}
-static void add_sha1_to_argv(const unsigned char sha1[20], void *data)
+static int add_sha1_to_argv(const unsigned char sha1[20], void *data)
{
argv_array_push(data, sha1_to_hex(sha1));
+ return 0;
}
static void calculate_changed_submodule_paths(void)