kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

tree-diff: diff_tree() should now be static 

We reworked all its users to use the functionality through
diff_tree_sha1 variant in recent patches (see "tree-diff: allow
diff_tree_sha1 to accept NULL sha1" and what comes next).

diff_tree() is now not used outside tree-diff.c - make it static.

Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Kirill Smelkov 2014-02-24 20:21:45 +04:00 committed by Junio C Hamano
parent 6ca844e9f5
commit ad6f3cc7d2
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff.h
View File

@ -189,8 +189,6 @@ const char *diff_line_prefix(struct diff_options *);


extern const char mime_boundary_leader[]; extern const char mime_boundary_leader[];


extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
const char *base, struct diff_options *opt);
extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
const char *base, struct diff_options *opt); const char *base, struct diff_options *opt);
extern int diff_root_tree_sha1(const unsigned char *new, const char *base, extern int diff_root_tree_sha1(const unsigned char *new, const char *base,

4
tree-diff.c
View File

@ -141,8 +141,8 @@ static void skip_uninteresting(struct tree_desc *t, struct strbuf *base,
} }
} }


int diff_tree(struct tree_desc *t1, struct tree_desc *t2, static int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
const char *base_str, struct diff_options *opt) const char *base_str, struct diff_options *opt)
{ {
struct strbuf base; struct strbuf base;
int baselen = strlen(base_str); int baselen = strlen(base_str);