@matheusbsbs / matheus-bagliano / commits / e8906a9019

builtin/fetch cleanup: always set default value for submodule recursing

The check for the default was introduced with 88a21979c5 (fetch/pull: recurse into submodules when necessary, 2011-03-06), which replaced an older construct (builtin/fetchs own implementation of the super-prefix) introduced in be254a0ea9 (Add the 'fetch.recurseSubmodules' config setting, 2010-11-11) which made sense at the time as there was no default fetch option for submodules at the time. Set builtin/fetch.c#recurse_submodules_default to the same value as submodule.c#config_fetch_recurse_submodules which is set via set_config_fetch_recurse_submodules, such that the condition for checking whether we have to set the default value becomes unnecessary. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Stefan Beller committed Jun 27, 2017 at 14:31 UTC e8906a9019799c0761ab5447b67582ffd9bae558

1 file changed +2 -3

builtin/fetch.c

+2 -3

@@ -49,7 +49,7 @@ static struct transport *gtransport;

49 static struct transport *gsecondary;

50 static const char *submodule_prefix = "";

51 static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;

52 -static int recurse_submodules_default = RECURSE_SUBMODULES_DEFAULT;

52 +static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;

53 static int shown_url = 0;

54 static int refmap_alloc, refmap_nr;

55 static const char **refmap_array;

@@ -1336,8 +1336,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)

1336 deepen = 1;

1337

1338 if (recurse_submodules != RECURSE_SUBMODULES_OFF) {

1339 - if (recurse_submodules_default != RECURSE_SUBMODULES_DEFAULT)

1340 - set_config_fetch_recurse_submodules(recurse_submodules_default);

1339 + set_config_fetch_recurse_submodules(recurse_submodules_default);

1340 gitmodules_config();

1341 git_config(submodule_config, NULL);

1342 }