diff options
| author | Carlos Rica <jasampler@gmail.com> | 2007-09-11 05:17:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-26 13:42:10 -0700 |
| commit | 102c2338da0b0954a04742f5cbe307fa6b49f225 (patch) | |
| tree | 9f8ce90c6b32050761f10783a9b7bbb2aea286a0 /merge-recursive.c | |
| parent | bce92405aebf217a4738bab0df89516910818e68 (diff) | |
| download | git-102c2338da0b0954a04742f5cbe307fa6b49f225.tar.gz | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 16f6a0f98b..19d5f3b287 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -171,30 +171,6 @@ static void output_commit_title(struct commit *commit) } } -static 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; -} - static int add_cacheinfo(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh, int options) { |