From 967cf9867de7c49393dfc666c941a1861d159639 Mon Sep 17 00:00:00 2001 From: Michael Schubert Date: Wed, 21 Dec 2011 13:05:27 +0100 Subject: builtin/log: remove redundant initialization "abbrev" and "commit_format" in struct rev_info get initialized in init_revisions - no need to reinit in cmd_log_init_defaults. Signed-off-by: Michael Schubert Signed-off-by: Junio C Hamano --- builtin/log.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'builtin') diff --git a/builtin/log.c b/builtin/log.c index f5d4930590..56bc555d11 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -72,8 +72,6 @@ static int decorate_callback(const struct option *opt, const char *arg, int unse static void cmd_log_init_defaults(struct rev_info *rev) { - rev->abbrev = DEFAULT_ABBREV; - rev->commit_format = CMIT_FMT_DEFAULT; if (fmt_pretty) get_commit_format(fmt_pretty, rev); rev->verbose_header = 1; -- cgit v1.2.1 From a31275d6ffd35bc1c269b7136f4031abe2abee70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Wed, 21 Dec 2011 18:14:09 +0000 Subject: clone: the -o option has nothing to do with MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is to give an alternate instead of "origin" to the remote we are cloning from. Signed-off-by: Carlos Martín Nieto Signed-off-by: Junio C Hamano --- builtin/clone.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'builtin') diff --git a/builtin/clone.c b/builtin/clone.c index efe8b6cce5..86db954730 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -84,8 +84,8 @@ static struct option builtin_clone_options[] = { "directory from which templates will be used"), OPT_CALLBACK(0 , "reference", &option_reference, "repo", "reference repository", &opt_parse_reference), - OPT_STRING('o', "origin", &option_origin, "branch", - "use instead of 'origin' to track upstream"), + OPT_STRING('o', "origin", &option_origin, "name", + "use instead of 'origin' to track upstream"), OPT_STRING('b', "branch", &option_branch, "branch", "checkout instead of the remote's HEAD"), OPT_STRING('u', "upload-pack", &option_upload_pack, "path", -- cgit v1.2.1