undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote: rename 'new' variables

Browse Source 
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>
This commit is contained in:
Brandon Williams 2018-02-14 10:59:47 -08:00 committed by Junio C Hamano
parent 1472b5bf68
commit f3bbe63038
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
remote.c
View File

@ -1970,33 +1970,33 @@ static void unmark_and_free(struct commit_list *list, unsigned int mark)
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid) int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
{ {
struct object *o; struct object *o;
struct commit *old, *new; struct commit *old_commit, *new_commit;
struct commit_list *list, *used; struct commit_list *list, *used;
int found = 0; int found = 0;
/* /*
* Both new and old must be commit-ish and new is descendant of * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
* old. Otherwise we require --force. * old_commit. Otherwise we require --force.
*/ */
o = deref_tag(parse_object(old_oid), NULL, 0); o = deref_tag(parse_object(old_oid), NULL, 0);
if (!o || o->type != OBJ_COMMIT) if (!o || o->type != OBJ_COMMIT)
return 0; return 0;
old = (struct commit *) o; old_commit = (struct commit *) o;
o = deref_tag(parse_object(new_oid), NULL, 0); o = deref_tag(parse_object(new_oid), NULL, 0);
if (!o || o->type != OBJ_COMMIT) if (!o || o->type != OBJ_COMMIT)
return 0; return 0;
new = (struct commit *) o; new_commit = (struct commit *) o;
if (parse_commit(new) < 0) if (parse_commit(new_commit) < 0)
return 0; return 0;
used = list = NULL; used = list = NULL;
commit_list_insert(new, &list); commit_list_insert(new_commit, &list);
while (list) { while (list) {
new = pop_most_recent_commit(&list, TMP_MARK); new_commit = pop_most_recent_commit(&list, TMP_MARK);
commit_list_insert(new, &used); commit_list_insert(new_commit, &used);
if (new == old) { if (new_commit == old_commit) {
found = 1; found = 1;
break; break;
} }