aboutsummaryrefslogtreecommitdiff
path: root/builtin/pack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2026-03-10 14:23:18 -0700
committerJunio C Hamano <gitster@pobox.com>2026-03-10 14:23:19 -0700
commit6953f24e4040b57d461a755fac297f272095ade7 (patch)
tree95584e9b20fbfd35492c90e83587132292e0ecbc /builtin/pack-objects.c
parentf330d46deeb143b6109143f37a47d025475d11d6 (diff)
parent237e520d81201eee609cf21e24f1c7ac6719ec8a (diff)
downloadgit-6953f24e4040b57d461a755fac297f272095ade7.tar.xz
Merge branch 'rs/parse-options-duplicated-long-options'
The parse-options API learned to notice an options[] array with duplicated long options. * rs/parse-options-duplicated-long-options: parseopt: check for duplicate long names and numerical options pack-objects: remove duplicate --stdin-packs definition
Diffstat (limited to 'builtin/pack-objects.c')
-rw-r--r--builtin/pack-objects.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index c1ee4d5ed7..983f473d12 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -4922,8 +4922,6 @@ int cmd_pack_objects(int argc,
OPT_CALLBACK_F(0, "stdin-packs", &stdin_packs, N_("mode"),
N_("read packs from stdin"),
PARSE_OPT_OPTARG, parse_stdin_packs_mode),
- OPT_BOOL(0, "stdin-packs", &stdin_packs,
- N_("read packs from stdin")),
OPT_BOOL(0, "stdout", &pack_to_stdout,
N_("output pack to stdout")),
OPT_BOOL(0, "include-tag", &include_tag,