{"thread":{"id":"14542","subject":"[PATCH] builtin-merge-recursive.c: make merge_recursive() static","startedAt":"2008-07-20T10:21:27Z","lastAt":"2008-07-22T08:47:25Z","messageCount":3,"participants":["Nanako Shiraishi","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"84012","messageId":"20080720192127.6117@nanako3.lavabit.com","threadId":"14542","inReplyTo":null,"subject":"[PATCH] builtin-merge-recursive.c: make merge_recursive() static","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2008-07-20T10:21:27Z","receivedAt":"2008-07-20T10:21:27Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"This function is not used by any other file.\n\nSigned-off-by: Nanako Shiraishi <nanako3@lavabit.com>\n---\n builtin-merge-recursive.c |    2 +-\n merge-recursive.h         |    7 -------\n 2 files changed, 1 insertions(+), 8 deletions(-)\n\ndiff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c\nindex 1ab1945..553aa16 100644\n--- a/builtin-merge-recursive.c\n+++ b/builtin-merge-recursive.c\n@@ -1247,7 +1247,7 @@ static struct commit_list *reverse_commit_list(struct commit_list *list)\n  * Merge the commits h1 and h2, return the resulting virtual\n  * commit object and a flag indicating the cleanness of the merge.\n  */\n-int merge_recursive(struct commit *h1,\n+static int merge_recursive(struct commit *h1,\n \t\t    struct commit *h2,\n \t\t    const char *branch1,\n \t\t    const char *branch2,\ndiff --git a/merge-recursive.h b/merge-recursive.h\nindex f37630a..8924371 100644\n--- a/merge-recursive.h\n+++ b/merge-recursive.h\n@@ -1,13 +1,6 @@\n #ifndef MERGE_RECURSIVE_H\n #define MERGE_RECURSIVE_H\n \n-int merge_recursive(struct commit *h1,\n-\t\t    struct commit *h2,\n-\t\t    const char *branch1,\n-\t\t    const char *branch2,\n-\t\t    struct commit_list *ancestors,\n-\t\t    struct commit **result);\n-\n int merge_trees(struct tree *head,\n \t\tstruct tree *merge,\n \t\tstruct tree *common,\n-- \n1.5.6.3\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"84023","messageId":"alpine.DEB.1.00.0807201403070.3305@eeepc-johanness","threadId":"14542","inReplyTo":"20080720192127.6117@nanako3.lavabit.com","subject":"Re: [PATCH] builtin-merge-recursive.c: make merge_recursive() static","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-07-20T12:03:56Z","receivedAt":"2008-07-20T12:03:56Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 20 Jul 2008, Nanako Shiraishi wrote:\n\n> This function is not used by any other file.\n\nAnd I thought it would be, in a future version of builtin-merge...\n\nOf course, we could apply this patch now, and revert it later, increasing \nyour commit count in the process :-)\n\nCiao,\nDscho\n"},{"id":"84308","messageId":"7vzloamhk2.fsf@gitster.siamese.dyndns.org","threadId":"14542","inReplyTo":"alpine.DEB.1.00.0807201403070.3305@eeepc-johanness","subject":"Re: [PATCH] builtin-merge-recursive.c: make merge_recursive() static","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-07-22T08:47:25Z","receivedAt":"2008-07-22T08:47:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> Of course, we could apply this patch now, and revert it later, increasing \n> your commit count in the process :-)\n\nHeh, don't tempt people, especially when we would have an interesting\nset of tools for statistics just around the corner ;-)\n"}]}