diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-07 01:54:07 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-07 01:54:07 +0300 |
commit | 169c9c0169a00876f699678ac66ebe9563b0c29f (patch) | |
tree | 5344fd15a9134aa92eaf79ff5959f616cceffa17 /split-index.c | |
parent | c14d5f99cd91347db3978c58c4b24d60ca29af75 (diff) | |
parent | efdfe11f4f1f901db1ebfa7ebda6337293a2e5c5 (diff) |
Merge branch 'bw/c-plus-plus'
Avoid using identifiers that clash with C++ keywords. Even though
it is not a goal to compile Git with C++ compilers, changes like
this help use of code analysis tools that targets C++ on our
codebase.
* bw/c-plus-plus: (37 commits)
replace: rename 'new' variables
trailer: rename 'template' variables
tempfile: rename 'template' variables
wrapper: rename 'template' variables
environment: rename 'namespace' variables
diff: rename 'template' variables
environment: rename 'template' variables
init-db: rename 'template' variables
unpack-trees: rename 'new' variables
trailer: rename 'new' variables
submodule: rename 'new' variables
split-index: rename 'new' variables
remote: rename 'new' variables
ref-filter: rename 'new' variables
read-cache: rename 'new' variables
line-log: rename 'new' variables
imap-send: rename 'new' variables
http: rename 'new' variables
entry: rename 'new' variables
diffcore-delta: rename 'new' variables
...
Diffstat (limited to 'split-index.c')
-rw-r--r-- | split-index.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/split-index.c b/split-index.c index 284d04d67f..3eb8ff1b43 100644 --- a/split-index.c +++ b/split-index.c @@ -305,17 +305,17 @@ void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce } void replace_index_entry_in_base(struct index_state *istate, - struct cache_entry *old, - struct cache_entry *new) + struct cache_entry *old_entry, + struct cache_entry *new_entry) { - if (old->index && + if (old_entry->index && istate->split_index && istate->split_index->base && - old->index <= istate->split_index->base->cache_nr) { - new->index = old->index; - if (old != istate->split_index->base->cache[new->index - 1]) - free(istate->split_index->base->cache[new->index - 1]); - istate->split_index->base->cache[new->index - 1] = new; + old_entry->index <= istate->split_index->base->cache_nr) { + new_entry->index = old_entry->index; + if (old_entry != istate->split_index->base->cache[new_entry->index - 1]) + free(istate->split_index->base->cache[new_entry->index - 1]); + istate->split_index->base->cache[new_entry->index - 1] = new_entry; } } |