---
>>
>> +fetch.verbose::
>> + If true, it is the same as setting "-v" on the command line. If it is
>> + false or not defined, git will use the command line parameters to
>> + decide the verboseness of fetch.
>> +
>
> Don't you usually use the configured option as the default, and
> then let the command line options override it (e.g., by specifying
> --no-verbose).
>
> //Peter
>
This patch fixes this objection.
Documentation/config.txt | 7 +++++++
builtin/fetch.c | 7 +++++++
builtin/push.c | 7 +++++++
3 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 39140ba..fc88d02 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -860,6 +860,9 @@ fetch.unpackLimit::
especially on slow filesystems. If not set, the value of
`transfer.unpackLimit` is used instead.
+fetch.verbose::
+ If true, it is the same as setting "-v" on the command line.
+
format.attach::
Enable multipart/mixed attachments as the default for
'format-patch'. The value can also be a double quoted string
@@ -1495,6 +1498,10 @@ push.default::
* `tracking` push the current branch to its upstream branch.
* `current` push the current branch to a branch of the same name.
+push.verbose::
+ If true, it is the same as using the '-v' flag on the command
+ line.
+
rebase.stat::
Whether to show a diffstat of what changed upstream since the last
rebase. False by default.
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 8470850..f4832fe 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -885,6 +885,12 @@ static int fetch_one(struct remote *remote, int argc, const char **argv)
return exit_code;
}
+static int git_fetch_verbose_config(const char *var,const char *value, void *dummy)
+{
+ if(!strcmp("fetch.verbose",var))
+ verbosity = git_config_maybe_bool(NULL,value);
+}
+
int cmd_fetch(int argc, const char **argv, const char *prefix)
{
int i;
@@ -897,6 +903,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
for (i = 1; i < argc; i++)
strbuf_addf(&default_rla, " %s", argv[i]);
+ git_config(git_fetch_verbose_config,NULL);
argc = parse_options(argc, argv, prefix,
builtin_fetch_options, builtin_fetch_usage, 0);
diff --git a/builtin/push.c b/builtin/push.c
index f4358b9..e907b11 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -202,6 +202,12 @@ static int do_push(const char *repo, int flags)
return !!errs;
}
+static int git_push_verbose_config(const char *var, const char *value, void *d)
+{
+ if(!strcmp("push.verbose",var))
+ verbosity = git_config_maybe_bool(NULL,value);
+}
+
int cmd_push(int argc, const char **argv, const char *prefix)
{
int flags = 0;
@@ -229,6 +235,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
};
git_config(git_default_config, NULL);
+ git_config(git_push_verbose_config, NULL);
argc = parse_options(argc, argv, prefix, options, push_usage, 0);
if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
--
1.7.1.97.gf85c7
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html