summaryrefslogtreecommitdiff
path: root/split-index.h
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2018-02-14 10:59:48 -0800
committerJunio C Hamano <gitster@pobox.com>2018-02-22 10:08:05 -0800
commit75b7b971ae07882c5ec6f76e21a0dbd76d70c187 (patch)
treefa8df071e194f3d0a916149cd4aa62d039df0330 /split-index.h
parentf3bbe630389480666ff865a7563859de4722664d (diff)
downloadgit-75b7b971ae07882c5ec6f76e21a0dbd76d70c187.tar.gz
split-index: rename 'new' variables
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'split-index.h')
-rw-r--r--split-index.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/split-index.h b/split-index.h
index df91c1bda8..43d66826eb 100644
--- a/split-index.h
+++ b/split-index.h
@@ -21,7 +21,7 @@ struct split_index *init_split_index(struct index_state *istate);
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 *new_entry);
int read_link_extension(struct index_state *istate,
const void *data, unsigned long sz);
int write_link_extension(struct strbuf *sb,