diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-04-06 13:38:31 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-04-06 13:38:31 -0700 |
commit | 6047b28eb7e1a0b0061c5310034f7b5683ea401a (patch) | |
tree | aaf1292a72a358ebefa2e5e12756a84ecf1fba02 /builtin/branch.c | |
parent | 72871b198f50962a555685726e42f435cdd4efa1 (diff) | |
parent | ec2f02696157d3781fbfd410f0017c49cc1eda01 (diff) | |
download | git-6047b28eb7e1a0b0061c5310034f7b5683ea401a.tar.gz |
Merge branch 'en/header-split-cleanup'
Split key function and data structure definitions out of cache.h to
new header files and adjust the users.
* en/header-split-cleanup:
csum-file.h: remove unnecessary inclusion of cache.h
write-or-die.h: move declarations for write-or-die.c functions from cache.h
treewide: remove cache.h inclusion due to setup.h changes
setup.h: move declarations for setup.c functions from cache.h
treewide: remove cache.h inclusion due to environment.h changes
environment.h: move declarations for environment.c functions from cache.h
treewide: remove unnecessary includes of cache.h
wrapper.h: move declarations for wrapper.c functions from cache.h
path.h: move function declarations for path.c functions from cache.h
cache.h: remove expand_user_path()
abspath.h: move absolute path functions from cache.h
environment: move comment_line_char from cache.h
treewide: remove unnecessary cache.h inclusion from several sources
treewide: remove unnecessary inclusion of gettext.h
treewide: be explicit about dependence on gettext.h
treewide: remove unnecessary cache.h inclusion from a few headers
Diffstat (limited to 'builtin/branch.c')
-rw-r--r-- | builtin/branch.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 43f6839b33..6413a016c5 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -8,9 +8,11 @@ #include "cache.h" #include "config.h" #include "color.h" +#include "environment.h" #include "refs.h" #include "commit.h" #include "builtin.h" +#include "gettext.h" #include "remote.h" #include "parse-options.h" #include "branch.h" @@ -24,6 +26,7 @@ #include "worktree.h" #include "help.h" #include "commit-reach.h" +#include "wrapper.h" static const char * const builtin_branch_usage[] = { N_("git branch [<options>] [-r | -a] [--merged] [--no-merged]"), |