From 250ab24ab3a35d5857855a2e00483dcd8867fdca Mon Sep 17 00:00:00 2001 From: Heiko Voigt Date: Wed, 16 Nov 2016 16:11:07 +0100 Subject: submodule_needs_pushing(): explain the behaviour when we cannot answer When we do not have commits that are involved in the update of the superproject in our copy of submodule, we cannot tell if the remote end needs to acquire these commits to be able to check out the superproject tree. Explain why we answer "no there is no need/point in pushing from our submodule repository" in this case. Signed-off-by: Heiko Voigt Signed-off-by: Junio C Hamano --- submodule.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/submodule.c b/submodule.c index 85287a1d16..b509488182 100644 --- a/submodule.c +++ b/submodule.c @@ -553,6 +553,17 @@ static int submodule_has_commits(const char *path, struct sha1_array *commits) static int submodule_needs_pushing(const char *path, struct sha1_array *commits) { if (!submodule_has_commits(path, commits)) + /* + * NOTE: We do consider it safe to return "no" here. The + * correct answer would be "We do not know" instead of + * "No push needed", but it is quite hard to change + * the submodule pointer without having the submodule + * around. If a user did however change the submodules + * without having the submodule around, this indicates + * an expert who knows what they are doing or a + * maintainer integrating work from other people. In + * both cases it should be safe to skip this check. + */ return 0; if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) { -- cgit v1.2.1