From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 6 Mar 2010 20:34:41 +0000 (+0100)
Subject: builtin/merge: make checkout_fast_forward() non static
X-Git-Tag: v1.7.1-rc0~36^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cac42b266a5868fc54b2e54986fa2689676ec447;p=git.git

builtin/merge: make checkout_fast_forward() non static

and also export it in "cache.h".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-merge.c b/builtin-merge.c
index 3aaec7bed..c04306684 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -667,7 +667,7 @@ static int count_unmerged_entries(void)
 	return ret;
 }
 
-static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
+int checkout_fast_forward(const unsigned char *head, const unsigned char *remote)
 {
 	struct tree *trees[MAX_UNPACK_TREES];
 	struct unpack_trees_options opts;
diff --git a/cache.h b/cache.h
index d454b7e68..3cce9077c 100644
--- a/cache.h
+++ b/cache.h
@@ -1040,4 +1040,7 @@ 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 */