diff options
| author | Brandon Williams <bmwill@google.com> | 2018-02-14 10:59:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-22 10:08:05 -0800 |
| commit | dfa5990d9a80743d54d7ab732a5530afc2b465c8 (patch) | |
| tree | 363795a7bb64d5989eb8f3312d9edeeb1005a646 | |
| parent | b2e4bafb68ba196c320e0c9eae0cd359403e7d3c (diff) | |
| download | git-dfa5990d9a80743d54d7ab732a5530afc2b465c8.tar.gz | |
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>
| -rw-r--r-- | builtin/reflog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/reflog.c b/builtin/reflog.c index 2233725315..ac3dcd7a51 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_commit, *new_commit; if (timestamp < cb->cmd.expire_total) return 1; - old = new = NULL; + old_commit = new_commit = NULL; if (cb->cmd.stalefix && - (!keep_entry(&old, ooid) || !keep_entry(&new, noid))) + (!keep_entry(&old_commit, 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_commit, ooid) || unreachable(cb, new_commit, noid)) return 1; } |