[PATCH] Use correct default remote for fetching in submodule.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



"git submodule update" first tries a regular "git fetch"
to fetch the commit, but when that doesn't retrieve the commit
it wants, it tries "git fetch <remote> <commit>".
For <remote>, it used the wrong default remote: the default
remote of the outer repository, rather than the default remote
of the submodule.

Signed-off-by: Mara Bos <mara@xxxxxxxxxx>
---
 builtin/submodule--helper.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 4c173d8b37..50b96e0b9d 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -2225,7 +2225,10 @@ static int fetch_in_submodule(const char *module_path, int depth, int quiet,
 		strvec_pushf(&cp.args, "--depth=%d", depth);
 	if (oid) {
 		char *hex = oid_to_hex(oid);
-		char *remote = get_default_remote();
+		char *remote;
+		int code = get_default_remote_submodule(module_path, &remote);
+		if (code)
+			return code;

 		strvec_pushl(&cp.args, remote, hex, NULL);
 		free(remote);
--
2.39.0



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux