mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
8b74d75cd2
commit
cac42b266a
|
@ -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;
|
||||
|
|
3
cache.h
3
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 */
|
||||
|
|
Loading…
Reference in a new issue