[PATCH] builtin-merge-recursive.c: make merge_recursive() static
From: Nanako Shiraishi <hidden>
Date: 2016-06-15 22:44:58
This function is not used by any other file. Signed-off-by: Nanako Shiraishi <redacted> --- builtin-merge-recursive.c | 2 +- merge-recursive.h | 7 ------- 2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 1ab1945..553aa16 100644
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c@@ -1247,7 +1247,7 @@ static struct commit_list *reverse_commit_list(struct commit_list *list) * Merge the commits h1 and h2, return the resulting virtual * commit object and a flag indicating the cleanness of the merge. */ -int merge_recursive(struct commit *h1, +static int merge_recursive(struct commit *h1, struct commit *h2, const char *branch1, const char *branch2,
diff --git a/merge-recursive.h b/merge-recursive.h
index f37630a..8924371 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h@@ -1,13 +1,6 @@ #ifndef MERGE_RECURSIVE_H #define MERGE_RECURSIVE_H -int merge_recursive(struct commit *h1, - struct commit *h2, - const char *branch1, - const char *branch2, - struct commit_list *ancestors, - struct commit **result); - int merge_trees(struct tree *head, struct tree *merge, struct tree *common,
--
1.5.6.3
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/