diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-27 22:36:42 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-27 22:36:42 +0400 |
commit | 793066e790d25a13abda67ebfad53453087bc31f (patch) | |
tree | ccdb019f9d2d7732d1f043d04be85290170e0db3 /builtin | |
parent | 982f6c90ee94b4a2afe1394c1bc62b9914d8a978 (diff) | |
parent | c51477229ee4c7846d40a447860b5bf94aa1103d (diff) |
Merge branch 'rj/sparse'
* rj/sparse:
sparse: Fix some "symbol not declared" warnings
sparse: Fix errors due to missing target-specific variables
sparse: Fix an "symbol 'merge_file' not decared" warning
sparse: Fix an "symbol 'format_subject' not declared" warning
sparse: Fix some "Using plain integer as NULL pointer" warnings
sparse: Fix an "symbol 'cmd_index_pack' not declared" warning
Makefile: Use cgcc rather than sparse in the check target
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/index-pack.c | 2 | ||||
-rw-r--r-- | builtin/merge-tree.c | 3 | ||||
-rw-r--r-- | builtin/shortlog.c | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 31f001f105..e40451ffb4 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "builtin.h" #include "delta.h" #include "pack.h" #include "csum-file.h" diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 19917426fb..897a563bc6 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; diff --git a/builtin/shortlog.c b/builtin/shortlog.c index f5efc67c9c..b6f4b0eb03 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -29,9 +29,6 @@ static int compare_by_number(const void *a1, const void *a2) return -1; } -const char *format_subject(struct strbuf *sb, const char *msg, - const char *line_separator); - static void insert_one_record(struct shortlog *log, const char *author, const char *oneline) |