From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Sverre Rabbelier <srabbelier@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>
Subject: [PATCH 2/7] revert: refactor code to find commit subject in find_commit_subject()
Date: Thu, 22 Jul 2010 15:18:30 +0200 [thread overview]
Message-ID: <20100722131836.2148.58435.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20100722131141.2148.63850.chriscool@tuxfamily.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/revert.c | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 3092233..ed89bba 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -99,10 +99,30 @@ struct commit_message {
const char *message;
};
+/* Find beginning and length of commit subject. */
+static int find_commit_subject(const char *commit_buffer, const char **subject)
+{
+ const char *eol;
+ const char *p = commit_buffer;
+
+ while (*p && (*p != '\n' || p[1] != '\n'))
+ p++;
+ if (*p) {
+ p += 2;
+ for (eol = p; *eol && *eol != '\n'; eol++)
+ ; /* do nothing */
+ } else
+ eol = p;
+
+ *subject = p;
+
+ return eol - p;
+}
+
static int get_message(const char *raw_message, struct commit_message *out)
{
const char *encoding;
- const char *p, *abbrev, *eol;
+ const char *p, *abbrev;
char *q;
int abbrev_len, oneline_len;
@@ -125,17 +145,7 @@ static int get_message(const char *raw_message, struct commit_message *out)
abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
abbrev_len = strlen(abbrev);
- /* Find beginning and end of commit subject. */
- p = out->message;
- while (*p && (*p != '\n' || p[1] != '\n'))
- p++;
- if (*p) {
- p += 2;
- for (eol = p; *eol && *eol != '\n'; eol++)
- ; /* do nothing */
- } else
- eol = p;
- oneline_len = eol - p;
+ oneline_len = find_commit_subject(out->message, &p);
out->parent_label = xmalloc(strlen("parent of ") + abbrev_len +
strlen("... ") + oneline_len + 1);
--
1.7.2.rc3.267.g400b3
next prev parent reply other threads:[~2010-07-22 13:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-22 13:18 [PATCH 0/7] find commit subject refactoring Christian Couder
2010-07-22 13:18 ` [PATCH 1/7] revert: fix off by one read when searching the end of a commit subject Christian Couder
2010-07-22 23:00 ` Jonathan Nieder
2010-07-22 13:18 ` Christian Couder [this message]
2010-07-22 16:50 ` [PATCH 2/7] revert: refactor code to find commit subject in find_commit_subject() Peter Baumann
2010-07-23 9:37 ` Christian Couder
2010-07-22 13:18 ` [PATCH 3/7] revert: rename subject related variables in get_message() Christian Couder
2010-07-22 13:18 ` [PATCH 4/7] commit: move find_commit_subject() into commit.{h,c} Christian Couder
2010-07-22 13:18 ` [PATCH 5/7] bisect: use find_commit_subject() instead of custom code Christian Couder
2010-07-22 13:18 ` [PATCH 6/7] merge-recursive: " Christian Couder
2010-07-22 13:18 ` [PATCH 7/7] blame: " Christian Couder
2010-07-22 18:23 ` [PATCH 0/7] find commit subject refactoring 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=20100722131836.2148.58435.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=srabbelier@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).