git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tay Ray Chuan <rctay89@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Miklos Vajna" <vmiklos@frugalware.org>
Subject: [PATCH 5/8] fmt-merge-msg: minor refactor of fmt_merge_msg()
Date: Tue, 11 May 2010 01:17:49 +0800	[thread overview]
Message-ID: <1273511872-4924-6-git-send-email-rctay89@gmail.com> (raw)
In-Reply-To: <1273511872-4924-1-git-send-email-rctay89@gmail.com>

Shift implementation into a private function, do_fmt_merge_msg(). This
allows for further changes to the implementation, without affecting the
interface.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
---
 builtin/fmt-merge-msg.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 379a031..a2bccd6 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -202,7 +202,8 @@ static void shortlog(const char *name, unsigned char *sha1,
 	string_list_clear(&subjects, 0);
 }
 
-int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {
+static int do_fmt_merge_msg(int merge_summary, struct strbuf *in,
+	struct strbuf *out) {
 	int limit = 20, i = 0, pos = 0;
 	char *sep = "";
 	unsigned char head_sha1[20];
@@ -296,6 +297,10 @@ int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {
 	return 0;
 }
 
+int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {
+	return do_fmt_merge_msg(merge_summary, in, out);
+}
+
 int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 {
 	const char *inpath = NULL;
-- 
1.7.1.189.g07419

  parent reply	other threads:[~2010-05-10 17:18 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-10 17:17 [PATCH 0/8] merge: allow --log to append shortlog to -m Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 1/8] t7604-merge-custom-message: shift expected output creation Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 2/8] t7604-merge-custom-message: show that --log doesn't append to -m Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 3/8] merge: update comment Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 4/8] merge: rename variable Tay Ray Chuan
2010-05-10 17:17 ` Tay Ray Chuan [this message]
2010-05-10 17:17 ` [PATCH 6/8] fmt-merge-msg: refactor merge title formatting Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 7/8] fmt-merge-msg: add function to append shortlog only Tay Ray Chuan
2010-05-10 17:17 ` [PATCH 8/8] merge: --log appends shortlog to message if specified Tay Ray Chuan

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=1273511872-4924-6-git-send-email-rctay89@gmail.com \
    --to=rctay89@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    --cc=vmiklos@frugalware.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.
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).