From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH 4/5] merge: make function try_merge_command non static Date: Wed, 31 Mar 2010 21:22:07 +0200 Message-ID: <20100331192209.5827.23048.chriscool@tuxfamily.org> References: <20100331192014.5827.90637.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Alexander Gladysh , Stephan Beyer , Daniel Barkalow To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Apr 01 00:46:03 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Nx6fi-0003M3-UH for gcvg-git-2@lo.gmane.org; Thu, 01 Apr 2010 00:46:03 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758332Ab0CaWpt (ORCPT ); Wed, 31 Mar 2010 18:45:49 -0400 Received: from smtp3-g21.free.fr ([212.27.42.3]:53018 "EHLO smtp3-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757328Ab0CaWpf (ORCPT ); Wed, 31 Mar 2010 18:45:35 -0400 Received: from smtp3-g21.free.fr (localhost [127.0.0.1]) by smtp3-g21.free.fr (Postfix) with ESMTP id 2978681809C; Thu, 1 Apr 2010 00:45:27 +0200 (CEST) Received: from style.boubyland (gre92-7-82-243-130-161.fbx.proxad.net [82.243.130.161]) by smtp3-g21.free.fr (Postfix) with ESMTP id E5C03818045; Thu, 1 Apr 2010 00:45:24 +0200 (CEST) X-git-sha1: 5bf1fe8b151bb2c8eb56a3255babd6e9b9d25a40 X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20100331192014.5827.90637.chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: and while at it let's move declaration of checkout_fast_forward() into "merge-recursive.h" instead of "cache.h" Signed-off-by: Christian Couder --- builtin/merge.c | 4 ++-- cache.h | 3 --- merge-recursive.h | 4 ++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index f163d53..fc240f9 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -548,8 +548,8 @@ static void write_tree_trivial(unsigned char *sha1) die("git write-tree failed to write a tree"); } -static int try_merge_command(const char *strategy, struct commit_list *common, - const char *head_arg, struct commit_list *remotes) +int try_merge_command(const char *strategy, struct commit_list *common, + const char *head_arg, struct commit_list *remotes) { const char **args; int i = 0, x = 0, ret; diff --git a/cache.h b/cache.h index 32c18b1..b065721 100644 --- a/cache.h +++ b/cache.h @@ -1059,7 +1059,4 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix); char *alias_lookup(const char *alias); int split_cmdline(char *cmdline, const char ***argv); -/* builtin/merge.c */ -int checkout_fast_forward(const unsigned char *from, const unsigned char *to); - #endif /* CACHE_H */ diff --git a/merge-recursive.h b/merge-recursive.h index d1192f5..9eb7e2d 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -54,4 +54,8 @@ int merge_recursive_generic(struct merge_options *o, void init_merge_options(struct merge_options *o); struct tree *write_tree_from_memory(struct merge_options *o); +/* builtin/merge.c */ +int checkout_fast_forward(const unsigned char *from, const unsigned char *to); +int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes); + #endif -- 1.7.0.3.454.gd9aeb