summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2011-04-07 18:31:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-11 17:35:25 (GMT)
commit1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d (patch)
tree980fa8b4c2a8f0adf0401f7d172697450da83e9b /builtin/merge-tree.c
parentc8f1444d9e708e3994c74c180194c43bf1588b65 (diff)
downloadgit-1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d.zip
git-1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d.tar.gz
git-1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d.tar.bz2
sparse: Fix an "symbol 'merge_file' not decared" warning
In order to fix the warning, we add a new "merge-file.h" header containing the extern declaration of the merge_file() function, and include the header in the source files that require the declaration. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
-rw-r--r--builtin/merge-tree.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 1991742..897a563 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -3,6 +3,7 @@
#include "xdiff-interface.h"
#include "blob.h"
#include "exec_cmd.h"
+#include "merge-file.h"
static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";
static int resolve_directories = 1;
@@ -54,8 +55,6 @@ static const char *explanation(struct merge_list *entry)
return "removed in remote";
}
-extern void *merge_file(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);
-
static void *result(struct merge_list *entry, unsigned long *size)
{
enum object_type type;