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>
Junio C Hamano committed
Mar 6, 2010 at 21:34 UTC
cac42b266a5868fc54b2e54986fa2689676ec447
2 files changed
+4
-1
builtin-merge.c
+1
-1
@@ -667,7 +667,7 @@ static int count_unmerged_entries(void)
667
return ret;
668
}
669
670
-static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
670
+int checkout_fast_forward(const unsigned char *head, const unsigned char *remote)
671
{
672
struct tree *trees[MAX_UNPACK_TREES];
673
struct unpack_trees_options opts;
cache.h
+3
@@ -1040,4 +1040,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix);
1040
char *alias_lookup(const char *alias);
1041
int split_cmdline(char *cmdline, const char ***argv);
1042
1043
+/* builtin/merge.c */
1044
+int checkout_fast_forward(const unsigned char *from, const unsigned char *to);
1045
+
1046
#endif /* CACHE_H */