]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rs/parse-options-duplicated-long-options'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Mar 2026 21:23:18 +0000 (14:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Mar 2026 21:23:19 +0000 (14:23 -0700)
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

1  2 
builtin/pack-objects.c
parse-options.c

Simple merge
diff --cc parse-options.c
Simple merge