[PATCH v4 2/7] builtin/merge: make checkout_fast_forward() non static
From: Christian Couder <hidden>
Date: 2016-06-15 22:48:23
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Junio C Hamano <redacted> and also export it in "cache.h". Signed-off-by: Christian Couder <redacted> --- builtin/merge.c | 2 +- cache.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 3aaec7b..c043066 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 89f6a40..0608b55 100644
--- a/cache.h
+++ b/cache.h@@ -1054,4 +1054,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 */
--
1.7.0.1.307.g861f4