[PATCH 12/37] reflog: rename 'new' variables
- From
- Brandon Williams <bmwill@google.com>
- Date
- Jan 29, 2018, 22:37 UTC
- Message-ID
- <20180129223728.30569-13-bmwill@google.com>
- In-Reply-To
- <20180129223728.30569-1-bmwill@google.com>
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> --- builtin/reflog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c index 223372531..c1bcab5c5 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -289,20 +289,20 @@ static int should_expire_reflog_ent(struct object_id *ooid, struct object_id *no const char *message, void *cb_data) { struct expire_reflog_policy_cb *cb = cb_data; - struct commit *old, *new; + struct commit *old, *new_commit; if (timestamp < cb->cmd.expire_total) return 1; - old = new = NULL; + old = new_commit = NULL; if (cb->cmd.stalefix && - (!keep_entry(&old, ooid) || !keep_entry(&new, noid))) + (!keep_entry(&old, ooid) || !keep_entry(&new_commit, noid))) return 1; if (timestamp < cb->cmd.expire_unreachable) { if (cb->unreachable_expire_kind == UE_ALWAYS) return 1; - if (unreachable(cb, old, ooid) || unreachable(cb, new, noid)) + if (unreachable(cb, old, ooid) || unreachable(cb, new_commit, noid)) return 1; }
-- 2.16.0.rc1.238.g530d649a79-goog