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 <chriscool@xxxxxxxxxxxxx>
---
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 ded3090..f7e501e 100644
--- a/cache.h
+++ b/cache.h
@@ -1056,7 +1056,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 be8410a..8640c00 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -53,4 +53,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.2.398.g89bc8ce
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html