diff options
| -rw-r--r-- | builtin-bundle.c | 1 | ||||
| -rw-r--r-- | builtin-checkout-index.c | 1 | ||||
| -rw-r--r-- | builtin-fetch--tool.c | 1 | ||||
| -rw-r--r-- | builtin-for-each-ref.c | 3 | ||||
| -rw-r--r-- | builtin-fsck.c | 3 | ||||
| -rw-r--r-- | builtin-gc.c | 1 | ||||
| -rw-r--r-- | builtin-merge-base.c | 1 | ||||
| -rw-r--r-- | builtin-merge-file.c | 7 | ||||
| -rw-r--r-- | builtin-pack-refs.c | 1 | ||||
| -rw-r--r-- | builtin-rerere.c | 1 | ||||
| -rw-r--r-- | builtin-runstatus.c | 1 | ||||
| -rw-r--r-- | builtin-show-ref.c | 1 |
12 files changed, 17 insertions, 5 deletions
diff --git a/builtin-bundle.c b/builtin-bundle.c index 306ad29597..6ae5ab04c9 100644 --- a/builtin-bundle.c +++ b/builtin-bundle.c @@ -1,3 +1,4 @@ +#include "builtin.h" #include "cache.h" #include "object.h" #include "commit.h" diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c index 8460f97b66..75377b9cab 100644 --- a/builtin-checkout-index.c +++ b/builtin-checkout-index.c @@ -36,6 +36,7 @@ * of "-a" causing problems (not possible in the above example, * but get used to it in scripting!). */ +#include "builtin.h" #include "cache.h" #include "strbuf.h" #include "quote.h" diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c index ed4d5de5d5..e2f8ede9ae 100644 --- a/builtin-fetch--tool.c +++ b/builtin-fetch--tool.c @@ -1,3 +1,4 @@ +#include "builtin.h" #include "cache.h" #include "refs.h" #include "commit.h" diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c index 2b218425aa..0afa1c5c41 100644 --- a/builtin-for-each-ref.c +++ b/builtin-for-each-ref.c @@ -1,3 +1,4 @@ +#include "builtin.h" #include "cache.h" #include "refs.h" #include "object.h" @@ -796,7 +797,7 @@ static struct ref_sort *default_sort(void) return sort; } -int cmd_for_each_ref(int ac, const char **av, char *prefix) +int cmd_for_each_ref(int ac, const char **av, const char *prefix) { int i, num_refs; const char *format = NULL; diff --git a/builtin-fsck.c b/builtin-fsck.c index a6ef65ea32..350ec5e144 100644 --- a/builtin-fsck.c +++ b/builtin-fsck.c @@ -1,3 +1,4 @@ +#include "builtin.h" #include "cache.h" #include "commit.h" #include "tree.h" @@ -659,7 +660,7 @@ static const char fsck_usage[] = "git-fsck [--tags] [--root] [[--unreachable] [--cache] [--full] " "[--strict] [--verbose] <head-sha1>*]"; -int cmd_fsck(int argc, char **argv, const char *prefix) +int cmd_fsck(int argc, const char **argv, const char *prefix) { int i, heads; diff --git a/builtin-gc.c b/builtin-gc.c index 45025fba30..9397482610 100644 --- a/builtin-gc.c +++ b/builtin-gc.c @@ -10,6 +10,7 @@ * Copyright (c) 2006 Shawn O. Pearce */ +#include "builtin.h" #include "cache.h" #include "run-command.h" diff --git a/builtin-merge-base.c b/builtin-merge-base.c index e35d362f26..0108e22ade 100644 --- a/builtin-merge-base.c +++ b/builtin-merge-base.c @@ -1,3 +1,4 @@ +#include "builtin.h" #include "cache.h" #include "commit.h" diff --git a/builtin-merge-file.c b/builtin-merge-file.c index 10ec63b17e..58deb62ac0 100644 --- a/builtin-merge-file.c +++ b/builtin-merge-file.c @@ -1,3 +1,4 @@ +#include "builtin.h" #include "cache.h" #include "xdiff/xdiff.h" #include "xdiff-interface.h" @@ -5,9 +6,9 @@ static const char merge_file_usage[] = "git merge-file [-p | --stdout] [-q | --quiet] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"; -int cmd_merge_file(int argc, char **argv, char **envp) +int cmd_merge_file(int argc, const char **argv, const char *prefix) { - char *names[3]; + const char *names[3]; mmfile_t mmfs[3]; mmbuffer_t result = {NULL, 0}; xpparam_t xpp = {XDF_NEED_MINIMAL}; @@ -51,7 +52,7 @@ int cmd_merge_file(int argc, char **argv, char **envp) free(mmfs[i].ptr); if (ret >= 0) { - char *filename = argv[1]; + const char *filename = argv[1]; FILE *f = to_stdout ? stdout : fopen(filename, "wb"); if (!f) diff --git a/builtin-pack-refs.c b/builtin-pack-refs.c index 758499238f..09df4e11a8 100644 --- a/builtin-pack-refs.c +++ b/builtin-pack-refs.c @@ -1,3 +1,4 @@ +#include "builtin.h" #include "cache.h" #include "refs.h" #include "object.h" diff --git a/builtin-rerere.c b/builtin-rerere.c index 6ffc43d864..29d057c98c 100644 --- a/builtin-rerere.c +++ b/builtin-rerere.c @@ -1,3 +1,4 @@ +#include "builtin.h" #include "cache.h" #include "path-list.h" #include "xdiff/xdiff.h" diff --git a/builtin-runstatus.c b/builtin-runstatus.c index 4b489b1214..2db25c88bf 100644 --- a/builtin-runstatus.c +++ b/builtin-runstatus.c @@ -1,3 +1,4 @@ +#include "builtin.h" #include "cache.h" #include "wt-status.h" diff --git a/builtin-show-ref.c b/builtin-show-ref.c index 9463ff0e69..65051d14fd 100644 --- a/builtin-show-ref.c +++ b/builtin-show-ref.c @@ -1,3 +1,4 @@ +#include "builtin.h" #include "cache.h" #include "refs.h" #include "object.h" |