From: Brandon Williams <bmwill@google.com>
Date: Wed, 14 Feb 2018 18:59:51 +0000 (-0800)
Subject: unpack-trees: rename 'new' variables
X-Git-Tag: v2.17.0-rc0~35^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69caed593e4b66ae1efd457f1c060171dc9baa5a;p=git

unpack-trees: 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>
---

diff --git a/unpack-trees.c b/unpack-trees.c
index 96c3327f19..bdedabcd57 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -194,10 +194,10 @@ static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
 static struct cache_entry *dup_entry(const struct cache_entry *ce)
 {
 	unsigned int size = ce_size(ce);
-	struct cache_entry *new = xmalloc(size);
+	struct cache_entry *new_entry = xmalloc(size);
 
-	memcpy(new, ce, size);
-	return new;
+	memcpy(new_entry, ce, size);
+	return new_entry;
 }
 
 static void add_entry(struct unpack_trees_options *o,