Re: [PATCH v3 2/4] read-cache.c: Refactor --ignore-missing implementation
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 27, 2014, 17:39 UTC
- Message-ID
- <xmqqy521nx25.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <e8a33f2e20e9f2041bf5f0fa952536755dbdf34c.1390833624.git.brad.king@kitware.com>
Brad King <brad.king@kitware.com> writes:
Show 6 quoted lines
> Move lstat ENOENT handling from refresh_index to refresh_cache_ent and > activate it with a new CE_MATCH_IGNORE_MISSING option. This will allow > other call paths into refresh_cache_ent to use the feature. > > Signed-off-by: Brad King <brad.king@kitware.com> > ---
Good!
I forgot that we had "update-index --ignore-missing --refresh", and that is conceptually the thing you want to use in your "perform merge-recursive in an empty tree while pretending that the working tree is fully populated and up-to-date" scenario.
Show 57 quoted lines
> cache.h | 2 ++
> read-cache.c | 8 +++++---
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/cache.h b/cache.h
> index c9efe88..c96ada7 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -498,6 +498,8 @@ extern void *read_blob_data_from_index(struct index_state *, const char *, unsig
> #define CE_MATCH_RACY_IS_DIRTY 02
> /* do stat comparison even if CE_SKIP_WORKTREE is true */
> #define CE_MATCH_IGNORE_SKIP_WORKTREE 04
> +/* ignore non-existent files during stat update */
> +#define CE_MATCH_IGNORE_MISSING 0x08
> extern int ie_match_stat(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
> extern int ie_modified(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
>
> diff --git a/read-cache.c b/read-cache.c
> index 33dd676..d61846c 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -1031,6 +1031,7 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
> int changed, size;
> int ignore_valid = options & CE_MATCH_IGNORE_VALID;
> int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
> + int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
>
> if (ce_uptodate(ce))
> return ce;
> @@ -1050,6 +1051,8 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
> }
>
> if (lstat(ce->name, &st) < 0) {
> + if (ignore_missing && errno == ENOENT)
> + return ce;
> if (err)
> *err = errno;
> return NULL;
> @@ -1127,7 +1130,8 @@ int refresh_index(struct index_state *istate, unsigned int flags,
> int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
> int first = 1;
> int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
> - unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
> + unsigned int options = ((really ? CE_MATCH_IGNORE_VALID : 0) |
> + (not_new ? CE_MATCH_IGNORE_MISSING : 0));
> const char *modified_fmt;
> const char *deleted_fmt;
> const char *typechange_fmt;
> @@ -1176,8 +1180,6 @@ int refresh_index(struct index_state *istate, unsigned int flags,
> if (!new) {
> const char *fmt;
>
> - if (not_new && cache_errno == ENOENT)
> - continue;
> if (really && cache_errno == EINVAL) {
> /* If we are doing --really-refresh that
> * means the index is not valid anymore.