Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit f9a482e

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8ced9c9 commit f9a482e

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

branch.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,10 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
101101
* config.
102102
*/
103103
static int setup_tracking(const char *new_ref, const char *orig_ref,
104-
enum branch_track track)
104+
enum branch_track track, int quiet)
105105
{
106106
struct tracking tracking;
107+
int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
107108

108109
if (strlen(new_ref) > 1024 - 7 - 7 - 1)
109110
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,
128129
return error("Not tracking: ambiguous information for ref %s",
129130
orig_ref);
130131

131-
install_branch_config(BRANCH_CONFIG_VERBOSE, new_ref, tracking.remote,
132+
install_branch_config(config_flags, new_ref, tracking.remote,
132133
tracking.src ? tracking.src : orig_ref);
133134

134135
free(tracking.src);
@@ -191,7 +192,7 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
191192
void create_branch(const char *head,
192193
const char *name, const char *start_name,
193194
int force, int reflog, int clobber_head,
194-
enum branch_track track)
195+
int quiet, enum branch_track track)
195196
{
196197
struct ref_lock *lock = NULL;
197198
struct commit *commit;
@@ -260,7 +261,7 @@ void create_branch(const char *head,
260261
start_name);
261262

262263
if (real_ref && track)
263-
setup_tracking(ref.buf+11, real_ref, track);
264+
setup_tracking(ref.buf+11, real_ref, track, quiet);
264265

265266
if (!dont_change_ref)
266267
if (write_ref_sha1(lock, sha1, msg) < 0)

branch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
void create_branch(const char *head, const char *name, const char *start_name,
1616
int force, int reflog,
17-
int clobber_head, enum branch_track track);
17+
int clobber_head, int quiet, enum branch_track track);
1818

1919
/*
2020
* Validates that the requested branch may be created, returning the

builtin/branch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
808808
if (kinds != REF_LOCAL_BRANCH)
809809
die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
810810
create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
811-
force_create, reflog, 0, track);
811+
force_create, reflog, 0, 0, track);
812812
} else
813813
usage_with_options(builtin_branch_usage, options);
814814

builtin/checkout.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,7 @@ static void update_refs_for_switch(struct checkout_opts *opts,
557557
opts->new_branch_force ? 1 : 0,
558558
opts->new_branch_log,
559559
opts->new_branch_force ? 1 : 0,
560+
opts->quiet,
560561
opts->track);
561562
new->name = opts->new_branch;
562563
setup_branch_path(new);

0 commit comments

Comments
 (0)