Commit baffc0e7 authored by Peter Hagervall's avatar Peter Hagervall Committed by Junio C Hamano

Make every builtin-*.c file #include "builtin.h"

Make every builtin-*.c file #include "builtin.h".

Also takes care of some declaration/definition mismatches.
Signed-off-by: default avatarPeter Hagervall <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 46cf98ba
#include "builtin.h"
#include "cache.h"
#include "object.h"
#include "commit.h"
......
......@@ -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"
......
#include "builtin.h"
#include "cache.h"
#include "refs.h"
#include "commit.h"
......
#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;
......
#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;
......
......@@ -10,6 +10,7 @@
* Copyright (c) 2006 Shawn O. Pearce
*/
#include "builtin.h"
#include "cache.h"
#include "run-command.h"
......
#include "builtin.h"
#include "cache.h"
#include "commit.h"
......
#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)
......
#include "builtin.h"
#include "cache.h"
#include "refs.h"
#include "object.h"
......
#include "builtin.h"
#include "cache.h"
#include "path-list.h"
#include "xdiff/xdiff.h"
......
#include "builtin.h"
#include "cache.h"
#include "wt-status.h"
......
#include "builtin.h"
#include "cache.h"
#include "refs.h"
#include "object.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment