From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Johannes Sixt" <j6t@kdbg.org>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 1/4] builtin/log.c: separate default and setup of cmd_log_init()
Date: Fri, 1 Apr 2011 11:20:31 +0200 [thread overview]
Message-ID: <3872d568e82874257c0bce931ef3051b96914671.1301649372.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <7vwrjfjdqr.fsf@alter.siamese.dyndns.org>
In-Reply-To: <cover.1301649372.git.git@drmicha.warpmail.net>
cmd_log_init() sets up some default rev options and then calls
setup_revisions(), so that a caller cannot set up own defaults: Either
they get overriden by cmd_log_init() (if set before) or they override
the command line (if set after). We even complain about this in a
comment to cmd_log_reflog().
Therefore, separate the two steps so that one can still call
cmd_log_init() or, alternatively, cmd_log_init_defaults() followed by
cmd_log_init_finish() (and set defaults in between).
No functional change so far.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
builtin/log.c | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index 9db43ed..f585209 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -49,13 +49,8 @@ static int parse_decoration_style(const char *var, const char *value)
return -1;
}
-static void cmd_log_init(int argc, const char **argv, const char *prefix,
- struct rev_info *rev, struct setup_revision_opt *opt)
+static void cmd_log_init_defaults(struct rev_info *rev)
{
- int i;
- int decoration_given = 0;
- struct userformat_want w;
-
rev->abbrev = DEFAULT_ABBREV;
rev->commit_format = CMIT_FMT_DEFAULT;
if (fmt_pretty)
@@ -68,7 +63,14 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
if (default_date_mode)
rev->date_mode = parse_date_format(default_date_mode);
+}
+static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
+ struct rev_info *rev, struct setup_revision_opt *opt)
+{
+ int i;
+ int decoration_given = 0;
+ struct userformat_want w;
/*
* Check for -h before setup_revisions(), or "git log -h" will
* fail when run without a git directory.
@@ -128,6 +130,13 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
setup_pager();
}
+static void cmd_log_init(int argc, const char **argv, const char *prefix,
+ struct rev_info *rev, struct setup_revision_opt *opt)
+{
+ cmd_log_init_defaults(rev);
+ cmd_log_init_finish(argc, argv, prefix, rev, opt);
+}
+
/*
* This gives a rough estimate for how many commits we
* will print out in the list.
--
1.7.4.2.668.gba03a4
next prev parent reply other threads:[~2011-04-01 9:24 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-31 6:45 Usability improvement request: git show revision -- file Piotr Krukowiecki
2011-03-31 7:50 ` Michael J Gruber
2011-03-31 9:17 ` [PATCH 1/3] t1506: factor out test for "Did you mean..." Michael J Gruber
2011-03-31 9:17 ` [PATCH 2/3] sha1_name: Suggest commit:./file for path in subdir Michael J Gruber
2011-03-31 19:26 ` Junio C Hamano
2011-04-01 6:52 ` Michael J Gruber
2011-04-01 19:11 ` Junio C Hamano
2011-03-31 9:17 ` [RFC/PATCH 3/3] builtin/show.c: do not prune by pathspec Michael J Gruber
2011-03-31 10:18 ` Johannes Sixt
2011-03-31 10:58 ` Michael J Gruber
2011-03-31 11:42 ` Johannes Sixt
2011-03-31 12:07 ` Michael J Gruber
2011-03-31 12:50 ` Nguyen Thai Ngoc Duy
2011-03-31 13:26 ` Michael J Gruber
2011-03-31 13:35 ` Nguyen Thai Ngoc Duy
2011-03-31 13:55 ` Michael J Gruber
2011-03-31 19:23 ` Junio C Hamano
2011-04-01 6:46 ` Michael J Gruber
2011-04-01 9:20 ` [PATCH 0/4] reflog, show and command line overrides Michael J Gruber
2011-04-01 9:20 ` Michael J Gruber [this message]
2011-04-01 9:20 ` [PATCH 2/4] t/t1411: test reflog with formats Michael J Gruber
2011-04-01 9:20 ` [PATCH 3/4] reflog: fix overriding of command line options Michael J Gruber
2011-04-01 9:20 ` [PATCH 4/4] builtin/show: do not prune by pathspec Michael J Gruber
2011-04-01 21:50 ` Junio C Hamano
2011-04-01 22:59 ` Junio C Hamano
2011-04-03 13:16 ` Michael J Gruber
2011-04-04 21:49 ` Junio C Hamano
2011-04-05 6:06 ` Michael J Gruber
2011-03-31 19:59 ` Usability improvement request: git show revision -- file Piotr Krukowiecki
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=3872d568e82874257c0bce931ef3051b96914671.1301649372.git.git@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=pclouds@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.
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).