From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Oct 2021 20:40:11 +0000 (-0700)
Subject: Merge branch 'tb/commit-graph-usage-fix'
X-Git-Tag: v2.34.0-rc0~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=844cc43377e2b7c02f01a06940e0a301ab2369e1;p=thirdparty%2Fgit.git

Merge branch 'tb/commit-graph-usage-fix'

Regression in "git commit-graph" command line parsing has been
corrected.

* tb/commit-graph-usage-fix:
  builtin/multi-pack-index.c: disable top-level --[no-]progress
  builtin/commit-graph.c: don't accept common --[no-]progress
---

844cc43377e2b7c02f01a06940e0a301ab2369e1
diff --cc Documentation/git-multi-pack-index.txt
index a9df3dbd32,5ba4bd5166..3b0b55cd75
--- a/Documentation/git-multi-pack-index.txt
+++ b/Documentation/git-multi-pack-index.txt
@@@ -9,8 -9,7 +9,7 @@@ git-multi-pack-index - Write and verif
  SYNOPSIS
  --------
  [verse]
- 'git multi-pack-index' [--object-dir=<dir>] [--[no-]progress]
- 	[--preferred-pack=<pack>] [--[no-]bitmap] <subcommand>
 -'git multi-pack-index' [--object-dir=<dir>] <sub-command>
++'git multi-pack-index' [--object-dir=<dir>] [--[no-]bitmap] <sub-command>
  
  DESCRIPTION
  -----------
diff --cc builtin/multi-pack-index.c
index 66de6efd41,5f11a3067d..0fb2439b0f
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@@ -68,8 -67,8 +67,10 @@@ static int cmd_multi_pack_index_write(i
  		OPT_STRING(0, "preferred-pack", &opts.preferred_pack,
  			   N_("preferred-pack"),
  			   N_("pack for reuse when computing a multi-pack bitmap")),
 +		OPT_BIT(0, "bitmap", &opts.flags, N_("write multi-pack bitmap"),
 +			MIDX_WRITE_BITMAP | MIDX_WRITE_REV_INDEX),
+ 		OPT_BIT(0, "progress", &opts.flags,
+ 			N_("force progress reporting"), MIDX_PROGRESS),
  		OPT_END(),
  	};