summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorPeter Hagervall <hager@cs.umu.se>2007-07-14 23:14:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-15 05:44:09 (GMT)
commitbaffc0e7708de1655665d150081e8880501736fe (patch)
tree267d9bfd87967c891fc25e8b5dcf1376ee8c816c /builtin-merge-file.c
parent46cf98baa5a1d74a9d00dc1092b29e4af93e8615 (diff)
downloadgit-baffc0e7708de1655665d150081e8880501736fe.zip
git-baffc0e7708de1655665d150081e8880501736fe.tar.gz
git-baffc0e7708de1655665d150081e8880501736fe.tar.bz2
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>
Diffstat (limited to 'builtin-merge-file.c')
-rw-r--r--builtin-merge-file.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 10ec63b..58deb62 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)