Changes since v5:
* revert v4
* drop the unnecessary block that Junio actually meant
Changes since v4:
* drop an unnecessary block (thanks Junio!)
Changes since v3:
* change commit message subject: builtin/fetch -> fetch --negotiate-only
* move the 'goto cleanup' to _after_ the submodule updating task because
we may want to update submodules even if objects were not fetched (as
pointed out by Junio, thanks!)
* disable submodule recursion in the patch that checks for
--negotiate-only + --recurse-submodules, so we never silently ignore
--recurse-submodules.
* incorporate some of Jonathan's suggestions (thanks!)
Changes since v2:
* added a prepatory patch that introduces a "goto cleanup"
* drop an unnecessary line move (as suggested by Junio)
* check for user-given --recurse-submodules and die() (as suggested by
Jonathan and Junio)
* update --negotiate-only's documentation
Changes since v1:
* added more context to commit message
* added a NEEDSWORK comment
Glen Choo (3):
fetch: use goto cleanup in cmd_fetch()
fetch: skip tasks related to fetching objects
fetch --negotiate-only: do not update submodules
Documentation/fetch-options.txt | 1 +
builtin/fetch.c | 40 ++++++++++++++++++++++++++++++---
t/t5516-fetch-push.sh | 12 ++++++++++
t/t5702-protocol-v2.sh | 12 ++++++++++
4 files changed, 62 insertions(+), 3 deletions(-)
Range-diff against v5:
1: ffa1a24109 = 1: ffa1a24109 fetch: use goto cleanup in cmd_fetch()
2: b0c73e8135 = 2: b0c73e8135 fetch: skip tasks related to fetching objects
3: f929297961 ! 3: 239101e752 fetch --negotiate-only: do not update submodules
@@ builtin/fetch.c: int cmd_fetch(int argc, const char **argv, const char *prefix)
+ if (recurse_submodules_cli != RECURSE_SUBMODULES_DEFAULT)
+ recurse_submodules = recurse_submodules_cli;
+
-+ if (negotiate_only)
++ if (negotiate_only) {
+ switch (recurse_submodules_cli) {
+ case RECURSE_SUBMODULES_OFF:
-+ case RECURSE_SUBMODULES_DEFAULT: {
++ case RECURSE_SUBMODULES_DEFAULT:
+ /*
+ * --negotiate-only should never recurse into
+ * submodules. Skip it by setting recurse_submodules to
@@ builtin/fetch.c: int cmd_fetch(int argc, const char **argv, const char *prefix)
+ */
+ recurse_submodules = RECURSE_SUBMODULES_OFF;
+ break;
-+ }
++
+ default:
+ die(_("--negotiate-only and --recurse-submodules cannot be used together"));
+ }
-+
++ }
+
if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
int *sfjc = submodule_fetch_jobs_config == -1
base-commit: 90d242d36e248acfae0033274b524bfa55a947fd
--
2.33.GIT
