{"thread":{"id":"9042","subject":"[PATCH] Make every builtin-*.c file #include \"builtin.h\"","startedAt":"2007-07-14T23:14:45Z","lastAt":"2007-07-15T06:12:11Z","messageCount":2,"participants":["Peter Hagervall","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"47390","messageId":"20070714231445.GA21180@scanner.cs.umu.se","threadId":"9042","inReplyTo":null,"subject":"[PATCH] Make every builtin-*.c file #include \"builtin.h\"","fromName":"Peter Hagervall","fromEmail":"hager@cs.umu.se","sentAt":"2007-07-14T23:14:45Z","receivedAt":"2007-07-14T23:14:45Z","isPatch":true,"sender":{"key":"hager@cs.umu.se","avatar":null},"body":"Make every builtin-*.c file #include \"builtin.h\".\n\nAlso takes care of some declaration/definition mismatches.\n\nSigned-off-by: Peter Hagervall <hager@cs.umu.se>\n---\n builtin-bundle.c         |    1 +\n builtin-checkout-index.c |    1 +\n builtin-fetch--tool.c    |    1 +\n builtin-for-each-ref.c   |    3 ++-\n builtin-fsck.c           |    3 ++-\n builtin-gc.c             |    1 +\n builtin-merge-base.c     |    1 +\n builtin-merge-file.c     |    7 ++++---\n builtin-pack-refs.c      |    1 +\n builtin-rerere.c         |    1 +\n builtin-runstatus.c      |    1 +\n builtin-show-ref.c       |    1 +\n 12 files changed, 17 insertions(+), 5 deletions(-)\n\ndiff --git a/builtin-bundle.c b/builtin-bundle.c\nindex 306ad29..6ae5ab0 100644\n--- a/builtin-bundle.c\n+++ b/builtin-bundle.c\n@@ -1,3 +1,4 @@\n+#include \"builtin.h\"\n #include \"cache.h\"\n #include \"object.h\"\n #include \"commit.h\"\ndiff --git a/builtin-checkout-index.c b/builtin-checkout-index.c\nindex 8460f97..75377b9 100644\n--- a/builtin-checkout-index.c\n+++ b/builtin-checkout-index.c\n@@ -36,6 +36,7 @@\n  * of \"-a\" causing problems (not possible in the above example,\n  * but get used to it in scripting!).\n  */\n+#include \"builtin.h\"\n #include \"cache.h\"\n #include \"strbuf.h\"\n #include \"quote.h\"\ndiff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c\nindex ed4d5de..e2f8ede 100644\n--- a/builtin-fetch--tool.c\n+++ b/builtin-fetch--tool.c\n@@ -1,3 +1,4 @@\n+#include \"builtin.h\"\n #include \"cache.h\"\n #include \"refs.h\"\n #include \"commit.h\"\ndiff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c\nindex 2b21842..0afa1c5 100644\n--- a/builtin-for-each-ref.c\n+++ b/builtin-for-each-ref.c\n@@ -1,3 +1,4 @@\n+#include \"builtin.h\"\n #include \"cache.h\"\n #include \"refs.h\"\n #include \"object.h\"\n@@ -796,7 +797,7 @@ static struct ref_sort *default_sort(void)\n \treturn sort;\n }\n \n-int cmd_for_each_ref(int ac, const char **av, char *prefix)\n+int cmd_for_each_ref(int ac, const char **av, const char *prefix)\n {\n \tint i, num_refs;\n \tconst char *format = NULL;\ndiff --git a/builtin-fsck.c b/builtin-fsck.c\nindex a6ef65e..350ec5e 100644\n--- a/builtin-fsck.c\n+++ b/builtin-fsck.c\n@@ -1,3 +1,4 @@\n+#include \"builtin.h\"\n #include \"cache.h\"\n #include \"commit.h\"\n #include \"tree.h\"\n@@ -659,7 +660,7 @@ static const char fsck_usage[] =\n \"git-fsck [--tags] [--root] [[--unreachable] [--cache] [--full] \"\n \"[--strict] [--verbose] <head-sha1>*]\";\n \n-int cmd_fsck(int argc, char **argv, const char *prefix)\n+int cmd_fsck(int argc, const char **argv, const char *prefix)\n {\n \tint i, heads;\n \ndiff --git a/builtin-gc.c b/builtin-gc.c\nindex 45025fb..9397482 100644\n--- a/builtin-gc.c\n+++ b/builtin-gc.c\n@@ -10,6 +10,7 @@\n  * Copyright (c) 2006 Shawn O. Pearce\n  */\n \n+#include \"builtin.h\"\n #include \"cache.h\"\n #include \"run-command.h\"\n \ndiff --git a/builtin-merge-base.c b/builtin-merge-base.c\nindex e35d362..0108e22 100644\n--- a/builtin-merge-base.c\n+++ b/builtin-merge-base.c\n@@ -1,3 +1,4 @@\n+#include \"builtin.h\"\n #include \"cache.h\"\n #include \"commit.h\"\n \ndiff --git a/builtin-merge-file.c b/builtin-merge-file.c\nindex 10ec63b..58deb62 100644\n--- a/builtin-merge-file.c\n+++ b/builtin-merge-file.c\n@@ -1,3 +1,4 @@\n+#include \"builtin.h\"\n #include \"cache.h\"\n #include \"xdiff/xdiff.h\"\n #include \"xdiff-interface.h\"\n@@ -5,9 +6,9 @@\n static const char merge_file_usage[] =\n \"git merge-file [-p | --stdout] [-q | --quiet] [-L name1 [-L orig [-L name2]]] file1 orig_file file2\";\n \n-int cmd_merge_file(int argc, char **argv, char **envp)\n+int cmd_merge_file(int argc, const char **argv, const char *prefix)\n {\n-\tchar *names[3];\n+\tconst char *names[3];\n \tmmfile_t mmfs[3];\n \tmmbuffer_t result = {NULL, 0};\n \txpparam_t xpp = {XDF_NEED_MINIMAL};\n@@ -51,7 +52,7 @@ int cmd_merge_file(int argc, char **argv, char **envp)\n \t\tfree(mmfs[i].ptr);\n \n \tif (ret >= 0) {\n-\t\tchar *filename = argv[1];\n+\t\tconst char *filename = argv[1];\n \t\tFILE *f = to_stdout ? stdout : fopen(filename, \"wb\");\n \n \t\tif (!f)\ndiff --git a/builtin-pack-refs.c b/builtin-pack-refs.c\nindex 7584992..09df4e1 100644\n--- a/builtin-pack-refs.c\n+++ b/builtin-pack-refs.c\n@@ -1,3 +1,4 @@\n+#include \"builtin.h\"\n #include \"cache.h\"\n #include \"refs.h\"\n #include \"object.h\"\ndiff --git a/builtin-rerere.c b/builtin-rerere.c\nindex 6ffc43d..29d057c 100644\n--- a/builtin-rerere.c\n+++ b/builtin-rerere.c\n@@ -1,3 +1,4 @@\n+#include \"builtin.h\"\n #include \"cache.h\"\n #include \"path-list.h\"\n #include \"xdiff/xdiff.h\"\ndiff --git a/builtin-runstatus.c b/builtin-runstatus.c\nindex 4b489b1..2db25c8 100644\n--- a/builtin-runstatus.c\n+++ b/builtin-runstatus.c\n@@ -1,3 +1,4 @@\n+#include \"builtin.h\"\n #include \"cache.h\"\n #include \"wt-status.h\"\n \ndiff --git a/builtin-show-ref.c b/builtin-show-ref.c\nindex 9463ff0..65051d1 100644\n--- a/builtin-show-ref.c\n+++ b/builtin-show-ref.c\n@@ -1,3 +1,4 @@\n+#include \"builtin.h\"\n #include \"cache.h\"\n #include \"refs.h\"\n #include \"object.h\"\n-- \n1.5.3.GIT\n"},{"id":"47401","messageId":"7v4pk6fb5w.fsf@assigned-by-dhcp.cox.net","threadId":"9042","inReplyTo":"20070714231445.GA21180@scanner.cs.umu.se","subject":"Re: [PATCH] Make every builtin-*.c file #include \"builtin.h\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-07-15T06:12:11Z","receivedAt":"2007-07-15T06:12:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Makes sense, thanks.\n"}]}