From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>, Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH 3/5] revert: simplify getting commit subject in format_todo()
Date: Wed, 7 Dec 2011 12:07:55 +0530 [thread overview]
Message-ID: <1323239877-24101-4-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1323239877-24101-1-git-send-email-artagnon@gmail.com>
format_todo() calls get_message(), but uses only the subject line of
the commit message. Save work and unnecessary memory allocations by
using find_commit_subject() instead. Also, remove the spurious check
on cur->item: the previous patch makes sure that instruction sheets
with missing commit subjects are parsable.
Suggested-by: Jonathan Nieder <jrnieder@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/revert.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 70055e5..706b8d4 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -697,16 +697,16 @@ static int format_todo(struct strbuf *buf, struct commit_list *todo_list,
struct replay_opts *opts)
{
struct commit_list *cur = NULL;
- struct commit_message msg = { NULL, NULL, NULL, NULL, NULL };
const char *sha1_abbrev = NULL;
const char *action_str = opts->action == REVERT ? "revert" : "pick";
+ const char *subject;
+ int subject_len;
for (cur = todo_list; cur; cur = cur->next) {
sha1_abbrev = find_unique_abbrev(cur->item->object.sha1, DEFAULT_ABBREV);
- if (get_message(cur->item, &msg))
- return error(_("Cannot get commit message for %s"), sha1_abbrev);
- strbuf_addf(buf, "%s %s %s\n", action_str, sha1_abbrev, msg.subject);
- free_message(&msg);
+ subject_len = find_commit_subject(cur->item->buffer, &subject);
+ strbuf_addf(buf, "%s %s %.*s\n", action_str, sha1_abbrev,
+ subject_len, subject);
}
return 0;
}
--
1.7.7.3
next prev parent reply other threads:[~2011-12-07 6:39 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-07 6:37 [PATCH 0/5] Re-roll rr/revert-cherry-pick Ramkumar Ramachandra
2011-12-07 6:37 ` [PATCH 1/5] revert: free msg in format_todo() Ramkumar Ramachandra
2011-12-07 6:43 ` Jonathan Nieder
2011-12-07 6:37 ` [PATCH 2/5] revert: make commit subjects in insn sheet optional Ramkumar Ramachandra
2011-12-07 7:02 ` Jonathan Nieder
2011-12-09 5:57 ` Ramkumar Ramachandra
2011-12-09 6:12 ` Ramkumar Ramachandra
2011-12-09 19:35 ` Jonathan Nieder
2011-12-09 19:44 ` Ramkumar Ramachandra
2011-12-09 19:50 ` Jonathan Nieder
2011-12-09 22:30 ` Ramkumar Ramachandra
2011-12-07 6:37 ` Ramkumar Ramachandra [this message]
2011-12-07 7:06 ` [PATCH 3/5] revert: simplify getting commit subject in format_todo() Jonathan Nieder
2011-12-07 6:37 ` [PATCH 4/5] revert: allow mixed pick and revert instructions Ramkumar Ramachandra
2011-12-07 7:45 ` Jonathan Nieder
2011-12-09 5:34 ` Ramkumar Ramachandra
2011-12-07 6:37 ` [PATCH 5/5] revert: simplify communicating command-line arguments Ramkumar Ramachandra
2011-12-07 8:09 ` Jonathan Nieder
2011-12-07 8:17 ` [PATCH 0/5] Re-roll rr/revert-cherry-pick Jonathan Nieder
2011-12-07 8:26 ` Ramkumar Ramachandra
2011-12-07 9:56 ` Jonathan Nieder
2011-12-07 8:28 ` Jonathan Nieder
2011-12-08 18:41 ` Junio C Hamano
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=1323239877-24101-4-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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).