mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit: 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:37 -08:00
committed by Junio C Hamano
parent 06fffa000c
commit 258c03eb45
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
commit.c
View File

@ -861,19 +861,19 @@ struct commit_list *get_octopus_merge_bases(struct commit_list *in)
commit_list_insert(in->item, &ret); commit_list_insert(in->item, &ret);
for (i = in->next; i; i = i->next) { for (i = in->next; i; i = i->next) {
struct commit_list *new = NULL, *end = NULL; struct commit_list *new_commits = NULL, *end = NULL;
for (j = ret; j; j = j->next) { for (j = ret; j; j = j->next) {
struct commit_list *bases; struct commit_list *bases;
bases = get_merge_bases(i->item, j->item); bases = get_merge_bases(i->item, j->item);
if (!new) if (!new_commits)
new = bases; new_commits = bases;
else else
end->next = bases; end->next = bases;
for (k = bases; k; k = k->next) for (k = bases; k; k = k->next)
end = k; end = k;
} }
ret = new; ret = new_commits;
} }
return ret; return ret;
} }
@ -1617,11 +1617,11 @@ struct commit *get_merge_parent(const char *name)
struct commit_list **commit_list_append(struct commit *commit, struct commit_list **commit_list_append(struct commit *commit,
struct commit_list **next) struct commit_list **next)
{ {
struct commit_list *new = xmalloc(sizeof(struct commit_list)); struct commit_list *new_commit = xmalloc(sizeof(struct commit_list));
new->item = commit; new_commit->item = commit;
*next = new; *next = new_commit;
new->next = NULL; new_commit->next = NULL;
return &new->next; return &new_commit->next;
} }
const char *find_commit_header(const char *msg, const char *key, size_t *out_len) const char *find_commit_header(const char *msg, const char *key, size_t *out_len)