Browse Source

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: Peter Hagervall <hager@cs.umu.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Peter Hagervall 18 years ago committed by Junio C Hamano
parent
commit
baffc0e770
  1. 1
      builtin-bundle.c
  2. 1
      builtin-checkout-index.c
  3. 1
      builtin-fetch--tool.c
  4. 3
      builtin-for-each-ref.c
  5. 3
      builtin-fsck.c
  6. 1
      builtin-gc.c
  7. 1
      builtin-merge-base.c
  8. 7
      builtin-merge-file.c
  9. 1
      builtin-pack-refs.c
  10. 1
      builtin-rerere.c
  11. 1
      builtin-runstatus.c
  12. 1
      builtin-show-ref.c

1
builtin-bundle.c

@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
#include "builtin.h"
#include "cache.h"
#include "object.h"
#include "commit.h"

1
builtin-checkout-index.c

@ -36,6 +36,7 @@ @@ -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"

1
builtin-fetch--tool.c

@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
#include "builtin.h"
#include "cache.h"
#include "refs.h"
#include "commit.h"

3
builtin-for-each-ref.c

@ -1,3 +1,4 @@ @@ -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) @@ -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;

3
builtin-fsck.c

@ -1,3 +1,4 @@ @@ -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[] = @@ -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;


1
builtin-gc.c

@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
* Copyright (c) 2006 Shawn O. Pearce
*/

#include "builtin.h"
#include "cache.h"
#include "run-command.h"


1
builtin-merge-base.c

@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
#include "builtin.h"
#include "cache.h"
#include "commit.h"


7
builtin-merge-file.c

@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
#include "builtin.h"
#include "cache.h"
#include "xdiff/xdiff.h"
#include "xdiff-interface.h"
@ -5,9 +6,9 @@ @@ -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) @@ -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)

1
builtin-pack-refs.c

@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
#include "builtin.h"
#include "cache.h"
#include "refs.h"
#include "object.h"

1
builtin-rerere.c

@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
#include "builtin.h"
#include "cache.h"
#include "path-list.h"
#include "xdiff/xdiff.h"

1
builtin-runstatus.c

@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
#include "builtin.h"
#include "cache.h"
#include "wt-status.h"


1
builtin-show-ref.c

@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
#include "builtin.h"
#include "cache.h"
#include "refs.h"
#include "object.h"

Loading…
Cancel
Save