diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-27 18:45:08 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-25 02:31:17 +0400 |
| commit | 257627268ad19cb616ad3feb6ca8171d400df287 (patch) | |
| tree | 66fa303f10673ddcc07878056bf3c800c7898f78 /merge-recursive.c | |
| parent | 2e2e7ec1ef567ac0a4ad8294ada15836661e6589 (diff) | |
read-cache.c: extend make_cache_entry refresh flag with options
Convert the make_cache_entry boolean 'refresh' argument to a more
general 'refresh_options' argument. Pass the value through to the
underlying refresh_cache_ent call. Add option CE_MATCH_REFRESH to
enable stat refresh. Update call sites to use the new signature.
Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index fc2f00176c..05311e411c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -201,7 +201,8 @@ static int add_cacheinfo(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh, int options) { struct cache_entry *ce; - ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh); + ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, + (refresh ? CE_MATCH_REFRESH : 0 )); if (!ce) return error(_("addinfo_cache failed for path '%s'"), path); return add_cache_entry(ce, options); |