Move make_cache_entry() from merge-recursive.c into read-cache.c
The function make_cache_entry() is too useful to be hidden away in merge-recursive. So move it to libgit.a (exposing it via cache.h). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
bce92405ae
commit
102c2338da
25
read-cache.c
25
read-cache.c
@ -434,6 +434,31 @@ int add_file_to_index(struct index_state *istate, const char *path, int verbose)
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct cache_entry *make_cache_entry(unsigned int mode,
|
||||
const unsigned char *sha1, const char *path, int stage,
|
||||
int refresh)
|
||||
{
|
||||
int size, len;
|
||||
struct cache_entry *ce;
|
||||
|
||||
if (!verify_path(path))
|
||||
return NULL;
|
||||
|
||||
len = strlen(path);
|
||||
size = cache_entry_size(len);
|
||||
ce = xcalloc(1, size);
|
||||
|
||||
hashcpy(ce->sha1, sha1);
|
||||
memcpy(ce->name, path, len);
|
||||
ce->ce_flags = create_ce_flags(len, stage);
|
||||
ce->ce_mode = create_ce_mode(mode);
|
||||
|
||||
if (refresh)
|
||||
return refresh_cache_entry(ce, 0);
|
||||
|
||||
return ce;
|
||||
}
|
||||
|
||||
int ce_same_name(struct cache_entry *a, struct cache_entry *b)
|
||||
{
|
||||
int len = ce_namelen(a);
|
||||
|
Reference in New Issue
Block a user