From 75b7b971ae07882c5ec6f76e21a0dbd76d70c187 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 14 Feb 2018 10:59:48 -0800 Subject: 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 Signed-off-by: Junio C Hamano --- split-index.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'split-index.h') 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, -- cgit v1.3-5-g45d5