From: Brandon Williams <bmwill@google.com>
To: git@vger.kernel.org
Cc: j6t@kdbg.org, sbeller@google.com, avarab@gmail.com,
pclouds@gmail.com, Brandon Williams <bmwill@google.com>
Subject: [PATCH v2 15/37] commit: rename 'new' variables
Date: Wed, 14 Feb 2018 10:59:37 -0800 [thread overview]
Message-ID: <20180214185959.221906-16-bmwill@google.com> (raw)
In-Reply-To: <20180214185959.221906-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>
---
commit.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/commit.c b/commit.c
index cd9ace105..874b6e510 100644
--- a/commit.c
+++ b/commit.c
@@ -861,19 +861,19 @@ struct commit_list *get_octopus_merge_bases(struct commit_list *in)
commit_list_insert(in->item, &ret);
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) {
struct commit_list *bases;
bases = get_merge_bases(i->item, j->item);
- if (!new)
- new = bases;
+ if (!new_commits)
+ new_commits = bases;
else
end->next = bases;
for (k = bases; k; k = k->next)
end = k;
}
- ret = new;
+ ret = new_commits;
}
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 **next)
{
- struct commit_list *new = xmalloc(sizeof(struct commit_list));
- new->item = commit;
- *next = new;
- new->next = NULL;
- return &new->next;
+ struct commit_list *new_commit = xmalloc(sizeof(struct commit_list));
+ new_commit->item = commit;
+ *next = new_commit;
+ new_commit->next = NULL;
+ return &new_commit->next;
}
const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
--
2.16.1.291.g4437f3f132-goog
next prev parent reply other threads:[~2018-02-14 19:01 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-29 22:36 [PATCH 00/37] removal of some c++ keywords Brandon Williams
2018-01-29 22:36 ` [PATCH 01/37] object_info: change member name from 'typename' to 'type_name' Brandon Williams
2018-01-29 22:36 ` [PATCH 02/37] object: rename function " Brandon Williams
2018-01-29 22:36 ` [PATCH 03/37] blame: rename 'this' variables Brandon Williams
2018-01-29 22:36 ` [PATCH 04/37] pack-objects: " Brandon Williams
2018-01-29 22:36 ` [PATCH 05/37] rev-parse: rename 'this' variable Brandon Williams
2018-01-29 22:36 ` [PATCH 06/37] diff: rename 'this' variables Brandon Williams
2018-01-29 22:36 ` [PATCH 07/37] apply: rename 'try' variables Brandon Williams
2018-01-29 22:36 ` [PATCH 08/37] apply: rename 'new' variables Brandon Williams
2018-01-29 22:37 ` [PATCH 09/37] checkout: " Brandon Williams
2018-01-29 22:37 ` [PATCH 10/37] help: " Brandon Williams
2018-01-29 22:37 ` [PATCH 11/37] pack-redundant: " Brandon Williams
2018-01-29 22:37 ` [PATCH 12/37] reflog: " Brandon Williams
2018-01-29 22:37 ` [PATCH 13/37] remote: " Brandon Williams
2018-01-29 22:37 ` [PATCH 14/37] combine-diff: " Brandon Williams
2018-01-29 22:37 ` [PATCH 15/37] commit: " Brandon Williams
2018-01-29 22:37 ` [PATCH 16/37] diff-lib: rename 'new' variable Brandon Williams
2018-01-29 22:37 ` [PATCH 17/37] diff: rename 'new' variables Brandon Williams
2018-01-29 22:37 ` [PATCH 18/37] diffcore-delta: " Brandon Williams
2018-01-29 22:37 ` [PATCH 19/37] entry: " Brandon Williams
2018-01-29 22:37 ` [PATCH 20/37] http: " Brandon Williams
2018-01-29 22:37 ` [PATCH 21/37] imap-send: " Brandon Williams
2018-01-29 22:37 ` [PATCH 22/37] line-log: " Brandon Williams
2018-01-29 22:37 ` [PATCH 23/37] read-cache: " Brandon Williams
2018-01-29 22:37 ` [PATCH 24/37] ref-filter: " Brandon Williams
2018-01-29 22:37 ` [PATCH 25/37] remote: " Brandon Williams
2018-01-29 22:37 ` [PATCH 26/37] split-index: " Brandon Williams
2018-01-29 22:37 ` [PATCH 27/37] submodule: " Brandon Williams
2018-01-29 22:37 ` [PATCH 28/37] trailer: " Brandon Williams
2018-01-29 22:37 ` [PATCH 29/37] unpack-trees: " Brandon Williams
2018-01-29 22:37 ` [PATCH 30/37] init-db: rename 'template' variables Brandon Williams
2018-01-29 22:37 ` [PATCH 31/37] environment: " Brandon Williams
2018-01-29 22:37 ` [PATCH 32/37] diff: " Brandon Williams
2018-01-29 22:37 ` [PATCH 33/37] environment: rename 'namespace' variables Brandon Williams
2018-01-29 22:37 ` [PATCH 34/37] wrapper: rename 'template' variables Brandon Williams
2018-01-29 22:37 ` [PATCH 35/37] tempfile: " Brandon Williams
2018-01-29 22:37 ` [PATCH 36/37] trailer: " Brandon Williams
2018-01-29 22:37 ` [PATCH 37/37] replace: rename 'new' variables Brandon Williams
2018-01-30 22:58 ` Stefan Beller
2018-01-30 23:21 ` Junio C Hamano
2018-01-30 0:13 ` [PATCH 00/37] removal of some c++ keywords Duy Nguyen
2018-01-30 22:36 ` Junio C Hamano
2018-01-30 23:01 ` Stefan Beller
2018-01-31 0:48 ` Duy Nguyen
2018-01-31 0:57 ` Stefan Beller
2018-01-31 1:05 ` Duy Nguyen
2018-01-30 20:54 ` Johannes Sixt
2018-02-14 18:59 ` [PATCH v2 " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 01/37] object_info: change member name from 'typename' to 'type_name' Brandon Williams
2018-02-14 18:59 ` [PATCH v2 02/37] object: rename function " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 03/37] blame: rename 'this' variables Brandon Williams
2018-02-14 18:59 ` [PATCH v2 04/37] pack-objects: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 05/37] rev-parse: rename 'this' variable Brandon Williams
2018-02-14 18:59 ` [PATCH v2 06/37] diff: rename 'this' variables Brandon Williams
2018-02-14 21:19 ` Junio C Hamano
2018-02-14 21:24 ` Brandon Williams
2018-02-14 18:59 ` [PATCH v2 07/37] apply: rename 'try' variables Brandon Williams
2018-02-14 18:59 ` [PATCH v2 08/37] apply: rename 'new' variables Brandon Williams
2018-02-14 21:40 ` Stefan Beller
2018-02-14 18:59 ` [PATCH v2 09/37] checkout: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 10/37] help: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 11/37] pack-redundant: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 12/37] reflog: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 13/37] remote: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 14/37] combine-diff: " Brandon Williams
2018-02-14 18:59 ` Brandon Williams [this message]
2018-02-14 18:59 ` [PATCH v2 16/37] diff-lib: rename 'new' variable Brandon Williams
2018-02-14 18:59 ` [PATCH v2 17/37] diff: rename 'new' variables Brandon Williams
2018-02-14 18:59 ` [PATCH v2 18/37] diffcore-delta: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 19/37] entry: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 20/37] http: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 21/37] imap-send: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 22/37] line-log: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 23/37] read-cache: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 24/37] ref-filter: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 25/37] remote: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 26/37] split-index: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 27/37] submodule: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 28/37] trailer: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 29/37] unpack-trees: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 30/37] init-db: rename 'template' variables Brandon Williams
2018-02-14 18:59 ` [PATCH v2 31/37] environment: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 32/37] diff: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 33/37] environment: rename 'namespace' variables Brandon Williams
2018-02-14 18:59 ` [PATCH v2 34/37] wrapper: rename 'template' variables Brandon Williams
2018-02-14 18:59 ` [PATCH v2 35/37] tempfile: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 36/37] trailer: " Brandon Williams
2018-02-14 18:59 ` [PATCH v2 37/37] replace: rename 'new' variables Brandon Williams
2018-02-14 22:41 ` [PATCH v2 00/37] removal of some c++ keywords Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180214185959.221906-16-bmwill@google.com \
--to=bmwill@google.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=pclouds@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).