[04/13] pack-objects: mark index-version option as NONEG

Message ID	20181105063938.GD25864@sigill.intra.peff.net (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> Date: Mon, 5 Nov 2018 01:39:38 -0500 From: Jeff King <peff@peff.net> To: git@vger.kernel.org Subject: [PATCH 04/13] pack-objects: mark index-version option as NONEG Message-ID: <20181105063938.GD25864@sigill.intra.peff.net> References: <20181105063718.GA24877@sigill.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20181105063718.GA24877@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk
Series	parseopt fixes from -Wunused-parameters \| expand [0/13] parseopt fixes from -Wunused-parameters [01/13] apply: mark include/exclude options as NONEG [02/13] am: handle --no-patch-format option [03/13] ls-files: mark exclude options as NONEG [04/13] pack-objects: mark index-version option as NONEG [05/13] cat-file: mark batch options with NONEG [06/13] status: mark --find-renames option with NONEG [07/13] format-patch: mark "--no-numbered" option with NONEG [08/13] show-branch: mark --reflog option as NONEG [09/13] tag: mark "--message" option with NONEG [10/13] cat-file: report an error on multiple --batch options [11/13] apply: return -1 from option callback instead of calling exit(1) [12/13] parse-options: drop OPT_DATE() [13/13] assert NOARG/NONEG behavior of parse-options callbacks

Message ID

20181105063938.GD25864@sigill.intra.peff.net (mailing list archive)

State

New, archived

Headers

Date: Mon, 5 Nov 2018 01:39:38 -0500
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 04/13] pack-objects: mark index-version option as NONEG
Message-ID: <20181105063938.GD25864@sigill.intra.peff.net>
References: <20181105063718.GA24877@sigill.intra.peff.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20181105063718.GA24877@sigill.intra.peff.net>
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

parseopt fixes from -Wunused-parameters | expand

Commit Message

Jeff King Nov. 5, 2018, 6:39 a.m. UTC

Running "git pack-objects --no-index-version" will segfault, since the
callback is not prepared to handle the "unset" flag.

In theory this might be used to counteract an earlier "--index-version",
or override a pack.indexversion config setting. But the semantics aren't
immediately obvious, and it's unlikely anybody wants this. Let's just
disable the broken option for now.

Signed-off-by: Jeff King <peff@peff.net>
---
 builtin/pack-objects.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index e50c6cd1ff..4eac2f997b 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -3252,7 +3252,7 @@  int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 			 N_("similar to --all-progress when progress meter is shown")),
 		{ OPTION_CALLBACK, 0, "index-version", NULL, N_("<version>[,<offset>]"),
 		  N_("write the pack index file in the specified idx format version"),
-		  0, option_parse_index_version },
+		  PARSE_OPT_NONEG, option_parse_index_version },
 		OPT_MAGNITUDE(0, "max-pack-size", &pack_size_limit,
 			      N_("maximum size of each output pack file")),
 		OPT_BOOL(0, "local", &local,

[04/13] pack-objects: mark index-version option as NONEG

Commit Message

Patch