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 5/7] bisect: use find_commit_subject() instead of custom code
Date: Thu, 22 Jul 2010 15:18:33 +0200 [thread overview]
Message-ID: <20100722131836.2148.55405.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20100722131141.2148.63850.chriscool@tuxfamily.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
bisect.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/bisect.c b/bisect.c
index b556b11..060c042 100644
--- a/bisect.c
+++ b/bisect.c
@@ -141,7 +141,8 @@ static void show_list(const char *debug, int counted, int nr,
enum object_type type;
unsigned long size;
char *buf = read_sha1_file(commit->object.sha1, &type, &size);
- char *ep, *sp;
+ const char *subject_start;
+ int subject_len;
fprintf(stderr, "%c%c%c ",
(flags & TREESAME) ? ' ' : 'T',
@@ -156,13 +157,9 @@ static void show_list(const char *debug, int counted, int nr,
fprintf(stderr, " %.*s", 8,
sha1_to_hex(pp->item->object.sha1));
- sp = strstr(buf, "\n\n");
- if (sp) {
- sp += 2;
- for (ep = sp; *ep && *ep != '\n'; ep++)
- ;
- fprintf(stderr, " %.*s", (int)(ep - sp), sp);
- }
+ subject_len = find_commit_subject(buf, &subject_start);
+ if (subject_len)
+ fprintf(stderr, " %.*s", subject_len, subject_start);
fprintf(stderr, "\n");
}
}
--
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 ` [PATCH 2/7] revert: refactor code to find commit subject in find_commit_subject() Christian Couder
2010-07-22 16:50 ` 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 ` Christian Couder [this message]
2010-07-22 13:18 ` [PATCH 6/7] merge-recursive: use find_commit_subject() instead of custom code 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.55405.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).