From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Jul 2023 16:45:21 +0000 (-0700)
Subject: Merge branch 'rs/describe-parseopt-fix'
X-Git-Tag: v2.42.0-rc0~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3085f949bf4aafe04dac7441308bb769ccf9c351;p=thirdparty%2Fgit.git

Merge branch 'rs/describe-parseopt-fix'

Command line parser fix.

* rs/describe-parseopt-fix:
  describe: fix --no-exact-match
---

3085f949bf4aafe04dac7441308bb769ccf9c351
diff --cc builtin/describe.c
index 7ce23e1b8e,a5ba584cdd..b28a4a1f82
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@@ -19,12 -19,12 +19,13 @@@
  #include "setup.h"
  #include "strvec.h"
  #include "run-command.h"
 -#include "object-store.h"
 +#include "object-store-ll.h"
  #include "list-objects.h"
  #include "commit-slab.h"
 +#include "wildmatch.h"
  
  #define MAX_TAGS	(FLAG_BITS - 1)
+ #define DEFAULT_CANDIDATES 10
  
  define_commit_slab(commit_names, struct commit_name *);