reflog: 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>
Brandon Williams committed
Feb 14, 2018 at 10:59 UTC
dfa5990d9a80743d54d7ab732a5530afc2b465c8
1 file changed
+4
-4
builtin/reflog.c
+4
-4
@@ -289,20 +289,20 @@ static int should_expire_reflog_ent(struct object_id *ooid, struct object_id *no
289
const char *message, void *cb_data)
290
{
291
struct expire_reflog_policy_cb *cb = cb_data;
292
- struct commit *old, *new;
292
+ struct commit *old_commit, *new_commit;
293
294
if (timestamp < cb->cmd.expire_total)
295
return 1;
296
297
- old = new = NULL;
297
+ old_commit = new_commit = NULL;
298
if (cb->cmd.stalefix &&
299
- (!keep_entry(&old, ooid) || !keep_entry(&new, noid)))
299
+ (!keep_entry(&old_commit, ooid) || !keep_entry(&new_commit, noid)))
300
return 1;
301
302
if (timestamp < cb->cmd.expire_unreachable) {
303
if (cb->unreachable_expire_kind == UE_ALWAYS)
304
return 1;
305
- if (unreachable(cb, old, ooid) || unreachable(cb, new, noid))
305
+ if (unreachable(cb, old_commit, ooid) || unreachable(cb, new_commit, noid))
306
return 1;
307
}
308