1. Stefan Saasen
  2. git

Commits

Peter Hagervall  committed baffc0e

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>

  • Participants
  • Parent commits 46cf98b
  • Branches master

Comments (0)

Files changed (12)

File builtin-bundle.c

View file
+#include "builtin.h"
 #include "cache.h"
 #include "object.h"
 #include "commit.h"

File builtin-checkout-index.c

View file
  * 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"

File builtin-fetch--tool.c

View file
+#include "builtin.h"
 #include "cache.h"
 #include "refs.h"
 #include "commit.h"

File builtin-for-each-ref.c

View file
+#include "builtin.h"
 #include "cache.h"
 #include "refs.h"
 #include "object.h"
 	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;

File builtin-fsck.c

View file
+#include "builtin.h"
 #include "cache.h"
 #include "commit.h"
 #include "tree.h"
 "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;
 

File builtin-gc.c

View file
  * Copyright (c) 2006 Shawn O. Pearce
  */
 
+#include "builtin.h"
 #include "cache.h"
 #include "run-command.h"
 

File builtin-merge-base.c

View file
+#include "builtin.h"
 #include "cache.h"
 #include "commit.h"
 

File builtin-merge-file.c

View file
+#include "builtin.h"
 #include "cache.h"
 #include "xdiff/xdiff.h"
 #include "xdiff-interface.h"
 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};
 		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)

File builtin-pack-refs.c

View file
+#include "builtin.h"
 #include "cache.h"
 #include "refs.h"
 #include "object.h"

File builtin-rerere.c

View file
+#include "builtin.h"
 #include "cache.h"
 #include "path-list.h"
 #include "xdiff/xdiff.h"

File builtin-runstatus.c

View file
+#include "builtin.h"
 #include "cache.h"
 #include "wt-status.h"
 

File builtin-show-ref.c

View file
+#include "builtin.h"
 #include "cache.h"
 #include "refs.h"
 #include "object.h"