checkout: suppress tracking message with "-q"
Like the "switched to..." message (which is already suppressed by "-q"), this message is purely informational. Let's silence it if the user asked us to be quiet. This patch is slightly more than a one-liner, because we have to teach create_branch to propagate the flag all the way down to install_branch_config. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Mar 26, 2012 at 19:51 UTC
f9a482e62b079cdf9e80889011b6f41f3c17f0c2
4 files changed
+8
-6
branch.c
+5
-4
@@ -101,9 +101,10 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
101
* config.
102
*/
103
static int setup_tracking(const char *new_ref, const char *orig_ref,
104
- enum branch_track track)
104
+ enum branch_track track, int quiet)
105
{
106
struct tracking tracking;
107
+ int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
108
109
if (strlen(new_ref) > 1024 - 7 - 7 - 1)
110
return error("Tracking not set up: name too long: %s",
@@ -128,7 +129,7 @@ static int setup_tracking(const char *new_ref, const char *orig_ref,
129
return error("Not tracking: ambiguous information for ref %s",
130
orig_ref);
131
131
- install_branch_config(BRANCH_CONFIG_VERBOSE, new_ref, tracking.remote,
132
+ install_branch_config(config_flags, new_ref, tracking.remote,
133
tracking.src ? tracking.src : orig_ref);
134
135
free(tracking.src);
@@ -191,7 +192,7 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
192
void create_branch(const char *head,
193
const char *name, const char *start_name,
194
int force, int reflog, int clobber_head,
194
- enum branch_track track)
195
+ int quiet, enum branch_track track)
196
{
197
struct ref_lock *lock = NULL;
198
struct commit *commit;
@@ -260,7 +261,7 @@ void create_branch(const char *head,
261
start_name);
262
263
if (real_ref && track)
263
- setup_tracking(ref.buf+11, real_ref, track);
264
+ setup_tracking(ref.buf+11, real_ref, track, quiet);
265
266
if (!dont_change_ref)
267
if (write_ref_sha1(lock, sha1, msg) < 0)
branch.h
+1
-1
@@ -14,7 +14,7 @@
14
*/
15
void create_branch(const char *head, const char *name, const char *start_name,
16
int force, int reflog,
17
- int clobber_head, enum branch_track track);
17
+ int clobber_head, int quiet, enum branch_track track);
18
19
/*
20
* Validates that the requested branch may be created, returning the
builtin/branch.c
+1
-1
@@ -808,7 +808,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
808
if (kinds != REF_LOCAL_BRANCH)
809
die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
810
create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
811
- force_create, reflog, 0, track);
811
+ force_create, reflog, 0, 0, track);
812
} else
813
usage_with_options(builtin_branch_usage, options);
814
builtin/checkout.c
+1
@@ -557,6 +557,7 @@ static void update_refs_for_switch(struct checkout_opts *opts,
557
opts->new_branch_force ? 1 : 0,
558
opts->new_branch_log,
559
opts->new_branch_force ? 1 : 0,
560
+ opts->quiet,
561
opts->track);
562
new->name = opts->new_branch;
563
setup_branch_path(new);