Skip to content

Commit f31d23a

Browse files
gitstergitster
committed
Merge branch 'bw/config-h'
Fix configuration codepath to pay proper attention to commondir that is used in multi-worktree situation, and isolate config API into its own header file. * bw/config-h: config: don't implicitly use gitdir or commondir config: respect commondir setup: teach discover_git_directory to respect the commondir config: don't include config.h by default config: remove git_config_iter config: create config.h
2 parents 5812b3f + dc8441f commit f31d23a

File tree

147 files changed

+397
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+397
-229
lines changed

‎advice.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "cache.h"
2+
#include "config.h"
23

34
int advice_push_update_rejected = 1;
45
int advice_push_non_ff_current = 1;

‎alias.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "cache.h"
2+
#include "config.h"
23

34
struct config_alias_data {
45
const char *alias;

‎apply.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99

1010
#include "cache.h"
11+
#include "config.h"
1112
#include "blob.h"
1213
#include "delta.h"
1314
#include "diff.h"

‎archive-tar.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright (c) 2005, 2006 Rene Scharfe
33
*/
44
#include "cache.h"
5+
#include "config.h"
56
#include "tar.h"
67
#include "archive.h"
78
#include "streaming.h"

‎archive-zip.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright (c) 2006 Rene Scharfe
33
*/
44
#include "cache.h"
5+
#include "config.h"
56
#include "archive.h"
67
#include "streaming.h"
78
#include "utf8.h"

‎archive.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "cache.h"
2+
#include "config.h"
23
#include "refs.h"
34
#include "commit.h"
45
#include "tree-walk.h"

‎attr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#define NO_THE_INDEX_COMPATIBILITY_MACROS
1111
#include "cache.h"
12+
#include "config.h"
1213
#include "exec_cmd.h"
1314
#include "attr.h"
1415
#include "dir.h"

‎bisect.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "cache.h"
2+
#include "config.h"
23
#include "commit.h"
34
#include "diff.h"
45
#include "revision.h"

‎branch.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "git-compat-util.h"
22
#include "cache.h"
3+
#include "config.h"
34
#include "branch.h"
45
#include "refs.h"
56
#include "remote.h"

‎builtin/add.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Copyright (C) 2006 Linus Torvalds
55
*/
66
#include "cache.h"
7+
#include "config.h"
78
#include "builtin.h"
89
#include "lockfile.h"
910
#include "dir.h"

‎builtin/am.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Based on git-am.sh by Junio C Hamano.
55
*/
66
#include "cache.h"
7+
#include "config.h"
78
#include "builtin.h"
89
#include "exec_cmd.h"
910
#include "parse-options.h"

‎builtin/blame.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
#include "cache.h"
9+
#include "config.h"
910
#include "builtin.h"
1011
#include "commit.h"
1112
#include "diff.h"

‎builtin/branch.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
#include "cache.h"
9+
#include "config.h"
910
#include "color.h"
1011
#include "refs.h"
1112
#include "commit.h"

‎builtin/cat-file.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Copyright (C) Linus Torvalds, 2005
55
*/
66
#include "cache.h"
7+
#include "config.h"
78
#include "builtin.h"
89
#include "diff.h"
910
#include "parse-options.h"

‎builtin/check-attr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "builtin.h"
22
#include "cache.h"
3+
#include "config.h"
34
#include "attr.h"
45
#include "quote.h"
56
#include "parse-options.h"

‎builtin/check-ignore.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "builtin.h"
22
#include "cache.h"
3+
#include "config.h"
34
#include "dir.h"
45
#include "quote.h"
56
#include "pathspec.h"

‎builtin/check-mailmap.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "builtin.h"
2+
#include "config.h"
23
#include "mailmap.h"
34
#include "parse-options.h"
45
#include "string-list.h"

‎builtin/checkout-index.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*
66
*/
77
#include "builtin.h"
8+
#include "config.h"
89
#include "lockfile.h"
910
#include "quote.h"
1011
#include "cache-tree.h"

‎builtin/checkout.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "builtin.h"
2+
#include "config.h"
23
#include "lockfile.h"
34
#include "parse-options.h"
45
#include "refs.h"

‎builtin/clean.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include "builtin.h"
1010
#include "cache.h"
11+
#include "config.h"
1112
#include "dir.h"
1213
#include "parse-options.h"
1314
#include "string-list.h"

‎builtin/clone.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010

1111
#include "builtin.h"
12+
#include "config.h"
1213
#include "lockfile.h"
1314
#include "parse-options.h"
1415
#include "fetch-pack.h"

‎builtin/column.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "builtin.h"
22
#include "cache.h"
3+
#include "config.h"
34
#include "strbuf.h"
45
#include "parse-options.h"
56
#include "string-list.h"

‎builtin/commit-tree.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Copyright (C) Linus Torvalds, 2005
55
*/
66
#include "cache.h"
7+
#include "config.h"
78
#include "commit.h"
89
#include "tree.h"
910
#include "builtin.h"

‎builtin/commit.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
#include "cache.h"
9+
#include "config.h"
910
#include "lockfile.h"
1011
#include "cache-tree.h"
1112
#include "color.h"

‎builtin/config.c

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "builtin.h"
22
#include "cache.h"
3+
#include "config.h"
34
#include "color.h"
45
#include "parse-options.h"
56
#include "urlmatch.h"
@@ -242,8 +243,8 @@ static int get_value(const char *key_, const char *regex_)
242243
}
243244
}
244245

245-
git_config_with_options(collect_config, &values,
246-
&given_config_source, &config_options);
246+
config_with_options(collect_config, &values,
247+
&given_config_source, &config_options);
247248

248249
ret = !values.nr;
249250

@@ -320,8 +321,8 @@ static void get_color(const char *var, const char *def_color)
320321
get_color_slot = var;
321322
get_color_found = 0;
322323
parsed_color[0] = '\0';
323-
git_config_with_options(git_get_color_config, NULL,
324-
&given_config_source, &config_options);
324+
config_with_options(git_get_color_config, NULL,
325+
&given_config_source, &config_options);
325326

326327
if (!get_color_found && def_color) {
327328
if (color_parse(def_color, parsed_color) < 0)
@@ -352,8 +353,8 @@ static int get_colorbool(const char *var, int print)
352353
get_colorbool_found = -1;
353354
get_diff_color_found = -1;
354355
get_color_ui_found = -1;
355-
git_config_with_options(git_get_colorbool_config, NULL,
356-
&given_config_source, &config_options);
356+
config_with_options(git_get_colorbool_config, NULL,
357+
&given_config_source, &config_options);
357358

358359
if (get_colorbool_found < 0) {
359360
if (!strcmp(get_colorbool_slot, "color.diff"))
@@ -441,8 +442,8 @@ static int get_urlmatch(const char *var, const char *url)
441442
show_keys = 1;
442443
}
443444

444-
git_config_with_options(urlmatch_config_entry, &config,
445-
&given_config_source, &config_options);
445+
config_with_options(urlmatch_config_entry, &config,
446+
&given_config_source, &config_options);
446447

447448
ret = !values.nr;
448449

@@ -538,6 +539,10 @@ int cmd_config(int argc, const char **argv, const char *prefix)
538539
config_options.respect_includes = !given_config_source.file;
539540
else
540541
config_options.respect_includes = respect_includes_opt;
542+
if (!nongit) {
543+
config_options.commondir = get_git_common_dir();
544+
config_options.git_dir = get_git_dir();
545+
}
541546

542547
if (end_null) {
543548
term = '\0';
@@ -582,9 +587,9 @@ int cmd_config(int argc, const char **argv, const char *prefix)
582587

583588
if (actions == ACTION_LIST) {
584589
check_argc(argc, 0, 0);
585-
if (git_config_with_options(show_all_config, NULL,
586-
&given_config_source,
587-
&config_options) < 0) {
590+
if (config_with_options(show_all_config, NULL,
591+
&given_config_source,
592+
&config_options) < 0) {
588593
if (given_config_source.file)
589594
die_errno("unable to read config file '%s'",
590595
given_config_source.file);

‎builtin/count-objects.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
#include "cache.h"
8+
#include "config.h"
89
#include "dir.h"
910
#include "builtin.h"
1011
#include "parse-options.h"

‎builtin/describe.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "cache.h"
2+
#include "config.h"
23
#include "lockfile.h"
34
#include "commit.h"
45
#include "tag.h"

‎builtin/diff-files.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Copyright (C) Linus Torvalds, 2005
55
*/
66
#include "cache.h"
7+
#include "config.h"
78
#include "diff.h"
89
#include "commit.h"
910
#include "revision.h"

‎builtin/diff-index.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "cache.h"
2+
#include "config.h"
23
#include "diff.h"
34
#include "commit.h"
45
#include "revision.h"

‎builtin/diff-tree.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "cache.h"
2+
#include "config.h"
23
#include "diff.h"
34
#include "commit.h"
45
#include "log-tree.h"

‎builtin/diff.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Copyright (c) 2006 Junio C Hamano
55
*/
66
#include "cache.h"
7+
#include "config.h"
78
#include "lockfile.h"
89
#include "color.h"
910
#include "commit.h"

‎builtin/difftool.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* Copyright (C) 2016 Johannes Schindelin
1313
*/
1414
#include "cache.h"
15+
#include "config.h"
1516
#include "builtin.h"
1617
#include "run-command.h"
1718
#include "exec_cmd.h"

‎builtin/fast-export.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
#include "builtin.h"
77
#include "cache.h"
8+
#include "config.h"
89
#include "refs.h"
910
#include "commit.h"
1011
#include "object.h"

‎builtin/fetch.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* "git fetch"
33
*/
44
#include "cache.h"
5+
#include "config.h"
56
#include "refs.h"
67
#include "commit.h"
78
#include "builtin.h"

‎builtin/fmt-merge-msg.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "builtin.h"
22
#include "cache.h"
3+
#include "config.h"
34
#include "refs.h"
45
#include "commit.h"
56
#include "diff.h"

‎builtin/for-each-ref.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "builtin.h"
22
#include "cache.h"
3+
#include "config.h"
34
#include "refs.h"
45
#include "object.h"
56
#include "parse-options.h"

‎builtin/fsck.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "builtin.h"
22
#include "cache.h"
3+
#include "config.h"
34
#include "commit.h"
45
#include "tree.h"
56
#include "blob.h"

‎builtin/gc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*/
1212

1313
#include "builtin.h"
14+
#include "config.h"
1415
#include "tempfile.h"
1516
#include "lockfile.h"
1617
#include "parse-options.h"

‎builtin/grep.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Copyright (c) 2006 Junio C Hamano
55
*/
66
#include "cache.h"
7+
#include "config.h"
78
#include "blob.h"
89
#include "tree.h"
910
#include "commit.h"

‎builtin/hash-object.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* Copyright (C) Junio C Hamano, 2005
66
*/
77
#include "builtin.h"
8+
#include "config.h"
89
#include "blob.h"
910
#include "quote.h"
1011
#include "parse-options.h"

‎builtin/help.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Builtin help command
33
*/
44
#include "cache.h"
5+
#include "config.h"
56
#include "builtin.h"
67
#include "exec_cmd.h"
78
#include "parse-options.h"

‎builtin/index-pack.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "builtin.h"
2+
#include "config.h"
23
#include "delta.h"
34
#include "pack.h"
45
#include "csum-file.h"

‎builtin/init-db.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Copyright (C) Linus Torvalds, 2005
55
*/
66
#include "cache.h"
7+
#include "config.h"
78
#include "refs.h"
89
#include "builtin.h"
910
#include "exec_cmd.h"

‎builtin/log.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* 2006 Junio Hamano
66
*/
77
#include "cache.h"
8+
#include "config.h"
89
#include "refs.h"
910
#include "color.h"
1011
#include "commit.h"

‎builtin/ls-files.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Copyright (C) Linus Torvalds, 2005
77
*/
88
#include "cache.h"
9+
#include "config.h"
910
#include "quote.h"
1011
#include "dir.h"
1112
#include "builtin.h"

0 commit comments

Comments
 (0)