remote: 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
f3bbe630389480666ff865a7563859de4722664d
1 file changed
+10
-10
remote.c
+10
-10
@@ -1970,33 +1970,33 @@ static void unmark_and_free(struct commit_list *list, unsigned int mark)
1970
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1971
{
1972
struct object *o;
1973
- struct commit *old, *new;
1973
+ struct commit *old_commit, *new_commit;
1974
struct commit_list *list, *used;
1975
int found = 0;
1976
1977
/*
1978
- * Both new and old must be commit-ish and new is descendant of
1979
- * old. Otherwise we require --force.
1978
+ * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
1979
+ * old_commit. Otherwise we require --force.
1980
*/
1981
o = deref_tag(parse_object(old_oid), NULL, 0);
1982
if (!o || o->type != OBJ_COMMIT)
1983
return 0;
1984
- old = (struct commit *) o;
1984
+ old_commit = (struct commit *) o;
1985
1986
o = deref_tag(parse_object(new_oid), NULL, 0);
1987
if (!o || o->type != OBJ_COMMIT)
1988
return 0;
1989
- new = (struct commit *) o;
1989
+ new_commit = (struct commit *) o;
1990
1991
- if (parse_commit(new) < 0)
1991
+ if (parse_commit(new_commit) < 0)
1992
return 0;
1993
1994
used = list = NULL;
1995
- commit_list_insert(new, &list);
1995
+ commit_list_insert(new_commit, &list);
1996
while (list) {
1997
- new = pop_most_recent_commit(&list, TMP_MARK);
1998
- commit_list_insert(new, &used);
1999
- if (new == old) {
1997
+ new_commit = pop_most_recent_commit(&list, TMP_MARK);
1998
+ commit_list_insert(new_commit, &used);
1999
+ if (new_commit == old_commit) {
2000
found = 1;
2001
break;
2002
}