mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/merge: make checkout_fast_forward() non static

Browse Source 
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:
Junio C Hamano
2010-03-06 21:34:41 +01:00
parent 8b74d75cd2
commit cac42b266a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-merge.c
View File

@ -667,7 +667,7 @@ static int count_unmerged_entries(void)
return ret; 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 tree *trees[MAX_UNPACK_TREES];
struct unpack_trees_options opts; struct unpack_trees_options opts;

3
cache.h
View File

@ -1040,4 +1040,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix);
char *alias_lookup(const char *alias); char *alias_lookup(const char *alias);
int split_cmdline(char *cmdline, const char ***argv); 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 */ #endif /* CACHE_H */