[PATCH 8/7] When adding files to the index, add support for case-independent matches
- From
Linus Torvalds <torvalds@linux-foundation.org>
- Date
- Mar 22, 2008, 21:19 UTC
- Message-ID
- <alpine.LFD.1.00.0803221417430.3020@woody.linux-foundation.org>
- In-Reply-To
- <alpine.LFD.1.00.0803221038320.3020@woody.linux-foundation.org>
From: Linus Torvalds <torvalds@woody.linux-foundation.org> Date: Sat, 22 Mar 2008 13:19:49 -0700
This simplifies the matching case of "I already have this file and it is up-to-date" and makes it do the right thing in the face of case-insensitive aliases.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---
This is patch 1/2 to make "git add" act better. Discard the previous simplistic and overly die()-eager patch that I hadn't signed off on.
read-cache.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/read-cache.c b/read-cache.c index 5dc998d..8c57adf 100644 --- a/read-cache.c +++ b/read-cache.c @@ -431,9 +431,9 @@ static int index_name_pos_also_unmerged(struct index_state *istate, int add_file_to_index(struct index_state *istate, const char *path, int verbose) { - int size, namelen, pos; + int size, namelen; struct stat st; - struct cache_entry *ce; + struct cache_entry *ce, *alias; unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY; if (lstat(path, &st)) @@ -466,13 +466,11 @@ int add_file_to_index(struct index_state *istate, const char *path, int verbose) ce->ce_mode = ce_mode_from_stat(ent, st.st_mode); } - pos = index_name_pos(istate, ce->name, namelen); - if (0 <= pos && - !ce_stage(istate->cache[pos]) && - !ie_match_stat(istate, istate->cache[pos], &st, ce_option)) { + alias = index_name_exists(istate, ce->name, ce_namelen(ce), ignore_case); + if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, &st, ce_option)) { /* Nothing changed, really */ free(ce); - ce_mark_uptodate(istate->cache[pos]); + ce_mark_uptodate(alias); return 0; }
-- 1.5.5.rc0.31.gdcfd.dirty