# [PATCH] builtin-merge-recursive.c: make merge_recursive() static 3 messages from 2008-07-20 to 2008-07-22. Participants: Nanako Shiraishi, Johannes Schindelin, Junio C Hamano. Thread: https://gitlist.dev/t/14542 ## Nanako Shiraishi, 2008-07-20 10:21 Subject: [PATCH] builtin-merge-recursive.c: make merge_recursive() static Message-ID: <20080720192127.6117@nanako3.lavabit.com> URL: https://gitlist.dev/e/20080720192127.6117%40nanako3.lavabit.com ``` This function is not used by any other file. Signed-off-by: Nanako Shiraishi --- 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/ ``` ## Johannes Schindelin, 2008-07-20 12:03 Subject: Re: [PATCH] builtin-merge-recursive.c: make merge_recursive() static Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0807201403070.3305%40eeepc-johanness In-Reply-To: <20080720192127.6117@nanako3.lavabit.com> ``` Hi, On Sun, 20 Jul 2008, Nanako Shiraishi wrote: > This function is not used by any other file. And I thought it would be, in a future version of builtin-merge... Of course, we could apply this patch now, and revert it later, increasing your commit count in the process :-) Ciao, Dscho ``` ## Junio C Hamano, 2008-07-22 08:47 Subject: Re: [PATCH] builtin-merge-recursive.c: make merge_recursive() static Message-ID: <7vzloamhk2.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vzloamhk2.fsf%40gitster.siamese.dyndns.org In-Reply-To: ``` Johannes Schindelin writes: > Of course, we could apply this patch now, and revert it later, increasing > your commit count in the process :-) Heh, don't tempt people, especially when we would have an interesting set of tools for statistics just around the corner ;-) ```