From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 Apr 2026 18:22:16 +0000 (-0700)
Subject: Merge branch 'js/parseopt-subcommand-autocorrection' into jch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f9502648c9e4e2605075a625ed802e5de31c861;p=thirdparty%2Fgit.git

Merge branch 'js/parseopt-subcommand-autocorrection' into jch

The parse-options library learned to auto-correct misspelled
subcommand names.

* js/parseopt-subcommand-autocorrection:
  doc: document autocorrect API
  parseopt: add tests for subcommand autocorrection
  parseopt: enable subcommand autocorrection for git-remote and git-notes
  parseopt: autocorrect mistyped subcommands
  autocorrect: provide config resolution API
  autocorrect: rename AUTOCORRECT_SHOW to AUTOCORRECT_HINT
  autocorrect: use mode and delay instead of magic numbers
  help: move tty check for autocorrection to autocorrect.c
  help: make autocorrect handling reusable
  parseopt: extract subcommand handling from parse_options_step()
---

8f9502648c9e4e2605075a625ed802e5de31c861
diff --cc parse-options.c
index a676da86f5,0b84061a38..4ecbb901f5
--- a/parse-options.c
+++ b/parse-options.c
@@@ -5,8 -5,9 +5,10 @@@
  #include "gettext.h"
  #include "strbuf.h"
  #include "string-list.h"
 +#include "strmap.h"
  #include "utf8.h"
+ #include "autocorrect.h"
+ #include "levenshtein.h"
  
  static int disallow_abbreviated_options;