Skip to content

fetch: skip unnecessary tasks when using --negotiate-only

Glen Choo git 7 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest3 patches 5 repliesIn review
  2. v63 patches 2 repliesSuperseded
  3. v53 patches 3 repliesSuperseded
Earlier versions · 4
VersionPostedPatchesRepliesStatus
v43 patches1 replySuperseded
v33 patches6 repliesSuperseded
v21 patch7 repliesSuperseded
v11 patch4 repliesSuperseded

Changes in v7 from the cover letter

* use standard message format introduced in 246cac8505 (i18n: turn even more messages into "cannot be used together" ones, 2022-01-05) (thanks Jiang Xin!)

Patches in v7 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3fetch: use goto cleanup in cmd_fetch()builtin/fetch.c+4 -30 replies
2/3fetch: skip tasks related to fetching objectsbuiltin/fetch.c+11 -00 replies
3/3fetch --negotiate-only: do not update submodulesDocumentation/fetch-options.txt builtin/fetch.c t/t5516-fetch-push.sh +1 more+49 -12 replies

Reviews trailers per patch

None of the 3 patches has a Reviewed-by or Acked-by.

PatchGlen Choo
SeriesHelped-by
1/3
2/3
3/3

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v7 thread

Cover letter [PATCH v7 0/3] fetch: skip unnecessary tasks when using --negotiate-only

Changes since v6:
* use standard message format introduced in 246cac8505 (i18n: turn even more messages into "cannot be used together" ones, 2022-01-05) (thanks Jiang Xin!)

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                 | 41 ++++++++++++++++++++++++++++++---
 t/t5516-fetch-push.sh           | 12 ++++++++++
 t/t5702-protocol-v2.sh          | 12 ++++++++++
 4 files changed, 63 insertions(+), 3 deletions(-)

Range-diff against v6:

1:  ffa1a24109 = 1:  ffa1a24109 fetch: use goto cleanup in cmd_fetch()
2:  b0c73e8135 = 2:  b0c73e8135 fetch: skip tasks related to fetching objects
3:  239101e752 ! 3:  7e0de7232b fetch --negotiate-only: do not update submodules
    @@ builtin/fetch.c: int cmd_fetch(int argc, const char **argv, const char *prefix)
     +			break;
     +
     +		default:
    -+			die(_("--negotiate-only and --recurse-submodules cannot be used together"));
    ++			die(_("options '%s' and '%s' cannot be used together"),
    ++			    "--negotiate-only", "--recurse-submodules");
     +		}
     +	}
     +

base-commit: 90d242d36e248acfae0033274b524bfa55a947fd

Signature · 1 line
2.33.GIT