On Mon, Jan 29, 2018 at 2:37 PM, Brandon Williams <bmwill@xxxxxxxxxx> wrote:
> 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@xxxxxxxxxx>
> ---
> builtin/replace.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/builtin/replace.c b/builtin/replace.c
> index 42cf4f62a..e48835b54 100644
> --- a/builtin/replace.c
> +++ b/builtin/replace.c
> @@ -284,7 +284,7 @@ static int edit_and_replace(const char *object_ref, int force, int raw)
> {
> char *tmpfile = git_pathdup("REPLACE_EDITOBJ");
> enum object_type type;
> - struct object_id old, new, prev;
> + struct object_id old, new_oid, prev;
new is a keyword that often comes with a counterpart, here `old`.
So while at it, also rename old to old_oid ?
Do we care about the symmetry enough to warrant additional churn for this?
Stefan
