From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 10/14] shortlog: change "author" variables to "ident"
Date: Tue, 29 Dec 2015 02:32:41 -0500 [thread overview]
Message-ID: <20151229073241.GJ8842@sigill.intra.peff.net> (raw)
In-Reply-To: <20151229071847.GA8726@sigill.intra.peff.net>
This is in preparation for shortlog counting more things
than just authors. Breaking it out into a separate patch
keeps the noise down when the real changes come.
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/shortlog.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 7ec6b76..d7eb0cb 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -47,7 +47,7 @@ static int compare_by_list(const void *a1, const void *a2)
}
static void insert_one_record(struct shortlog *log,
- const char *author,
+ const char *ident_string,
const char *oneline)
{
struct string_list_item *item;
@@ -56,7 +56,7 @@ static void insert_one_record(struct shortlog *log,
struct strbuf namemailbuf = STRBUF_INIT;
struct ident_split ident;
- if (split_ident_line(&ident, author, strlen(author)))
+ if (split_ident_line(&ident, ident_string, strlen(ident_string)))
return;
namebuf = ident.name_begin;
@@ -115,12 +115,12 @@ static void insert_one_record(struct shortlog *log,
static void read_from_stdin(struct shortlog *log)
{
- struct strbuf author = STRBUF_INIT;
+ struct strbuf ident = STRBUF_INIT;
struct strbuf oneline = STRBUF_INIT;
- while (strbuf_getline(&author, stdin, '\n') != EOF) {
+ while (strbuf_getline(&ident, stdin, '\n') != EOF) {
const char *v;
- if (!skip_prefix_icase(author.buf, "Author: ", &v))
+ if (!skip_prefix_icase(ident.buf, "Author: ", &v))
continue;
while (strbuf_getline(&oneline, stdin, '\n') != EOF &&
oneline.len)
@@ -130,13 +130,13 @@ static void read_from_stdin(struct shortlog *log)
; /* discard blanks */
insert_one_record(log, v, oneline.buf);
}
- strbuf_release(&author);
+ strbuf_release(&ident);
strbuf_release(&oneline);
}
void shortlog_add_commit(struct shortlog *log, struct commit *commit)
{
- struct strbuf author = STRBUF_INIT;
+ struct strbuf ident = STRBUF_INIT;
struct strbuf oneline = STRBUF_INIT;
struct pretty_print_context ctx = {0};
@@ -147,8 +147,8 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
ctx.date_mode.type = DATE_NORMAL;
ctx.output_encoding = get_log_output_encoding();
- format_commit_message(commit, "%an <%ae>", &author, &ctx);
- if (author.len <= 3) {
+ format_commit_message(commit, "%an <%ae>", &ident, &ctx);
+ if (ident.len <= 3) {
warning(_("Missing author: %s"),
oid_to_hex(&commit->object.oid));
return;
@@ -161,8 +161,8 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
format_commit_message(commit, "%s", &oneline, &ctx);
}
- insert_one_record(log, author.buf, oneline.len ? oneline.buf : "<none>");
- strbuf_release(&author);
+ insert_one_record(log, ident.buf, oneline.len ? oneline.buf : "<none>");
+ strbuf_release(&ident);
strbuf_release(&oneline);
}
--
2.7.0.rc3.367.g09631da
next prev parent reply other threads:[~2015-12-29 7:32 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-29 7:18 [PATCH 0/14] counting trailers with shortlogs Jeff King
2015-12-29 7:19 ` [PATCH 01/14] move string functions out of git-compat-util Jeff King
2015-12-29 7:20 ` [PATCH 02/14] log: refactor add_header to drop some magic numbers Jeff King
2015-12-31 6:21 ` Eric Sunshine
2016-01-01 8:42 ` Jeff King
2016-01-01 8:46 ` Jeff King
2015-12-29 7:22 ` [PATCH 03/14] strutil: add skip_prefix_icase Jeff King
2015-12-31 6:40 ` Eric Sunshine
2016-01-01 8:50 ` Jeff King
2015-12-29 7:27 ` [PATCH 04/14] shortlog: use skip_prefix_icase to parse "Author" lines Jeff King
2015-12-31 6:47 ` Eric Sunshine
2016-01-01 8:53 ` Jeff King
2015-12-29 7:28 ` [PATCH 05/14] shortlog: use strbufs to read from stdin Jeff King
2015-12-29 7:29 ` [PATCH 06/14] shortlog: replace hand-parsing of author with pretty-printer Jeff King
2016-01-04 9:43 ` Eric Sunshine
2016-01-04 10:17 ` Jeff King
2015-12-29 7:30 ` [PATCH 07/14] shortlog: optimize "--summary" mode Jeff King
2015-12-29 7:31 ` [PATCH 08/14] shortlog: optimize out useless "<none>" normalization Jeff King
2015-12-29 7:32 ` [PATCH 09/14] shortlog: optimize out useless string list Jeff King
2015-12-29 7:32 ` Jeff King [this message]
2015-12-29 7:35 ` [PATCH 11/14] shortlog: allow grouping by committer ident Jeff King
2016-01-04 9:44 ` Eric Sunshine
2016-01-04 10:23 ` Jeff King
2015-12-29 7:35 ` [PATCH 12/14] trailer: factor out config reading Jeff King
2015-12-29 7:36 ` [PATCH 13/14] trailer: add interface for parsing commit trailers Jeff King
2015-12-29 7:38 ` [PATCH 14/14] shortlog: match commit trailers with --ident Jeff King
2015-12-29 7:50 ` Jeff King
2016-01-04 9:44 ` Eric Sunshine
2016-01-04 10:31 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151229073241.GJ8842@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).