aboutsummaryrefslogtreecommitdiffstats
path: root/parse-options.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-10 11:39:14 -0700
committerJunio C Hamano <gitster@pobox.com>2023-10-10 11:39:14 -0700
commita7a2d10421b735944f376f1de53b437bfbb93e88 (patch)
tree7004d754ae7d6fc1e51820f556d0570da835e42c /parse-options.c
parent3df51ea0a5ef88b801ab30ca28f159b898183926 (diff)
parentb1bda751739d90e1a94b47397676bcb8eebf16d5 (diff)
downloadgit-a7a2d10421b735944f376f1de53b437bfbb93e88.tar.gz
Merge branch 'cw/prelim-cleanup'
Shuffle some bits across headers and sources to prepare for libification effort. * cw/prelim-cleanup: parse: separate out parsing functions from config.h config: correct bad boolean env value error message wrapper: reduce scope of remove_or_warn() hex-ll: separate out non-hash-algo functions
Diffstat (limited to 'parse-options.c')
-rw-r--r--parse-options.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/parse-options.c b/parse-options.c
index e8e076c3a6..093eaf2db8 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -1,11 +1,12 @@
#include "git-compat-util.h"
#include "parse-options.h"
#include "abspath.h"
-#include "config.h"
+#include "parse.h"
#include "commit.h"
#include "color.h"
#include "gettext.h"
#include "strbuf.h"
+#include "string-list.h"
#include "utf8.h"
static int disallow_abbreviated_options;