undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkout: suppress tracking message with "-q"

Browse Source 
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>
This commit is contained in:
Jeff King 2012-03-26 19:51:01 -04:00 committed by Junio C Hamano
parent 8ced9c90a2
commit f9a482e62b
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
branch.c
View File

@ -101,9 +101,10 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
* config. * config.
*/ */
static int setup_tracking(const char *new_ref, const char *orig_ref, static int setup_tracking(const char *new_ref, const char *orig_ref,
enum branch_track track) enum branch_track track, int quiet)
{ {
struct tracking tracking; struct tracking tracking;
int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
if (strlen(new_ref) > 1024 - 7 - 7 - 1) if (strlen(new_ref) > 1024 - 7 - 7 - 1)
return error("Tracking not set up: name too long: %s", 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,
return error("Not tracking: ambiguous information for ref %s", return error("Not tracking: ambiguous information for ref %s",
orig_ref); orig_ref);
install_branch_config(BRANCH_CONFIG_VERBOSE, new_ref, tracking.remote, install_branch_config(config_flags, new_ref, tracking.remote,
tracking.src ? tracking.src : orig_ref); tracking.src ? tracking.src : orig_ref);
free(tracking.src); free(tracking.src);
@ -191,7 +192,7 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
void create_branch(const char *head, void create_branch(const char *head,
const char *name, const char *start_name, const char *name, const char *start_name,
int force, int reflog, int clobber_head, int force, int reflog, int clobber_head,
enum branch_track track) int quiet, enum branch_track track)
{ {
struct ref_lock *lock = NULL; struct ref_lock *lock = NULL;
struct commit *commit; struct commit *commit;
@ -260,7 +261,7 @@ void create_branch(const char *head,
start_name); start_name);
if (real_ref && track) if (real_ref && track)
setup_tracking(ref.buf+11, real_ref, track); setup_tracking(ref.buf+11, real_ref, track, quiet);
if (!dont_change_ref) if (!dont_change_ref)
if (write_ref_sha1(lock, sha1, msg) < 0) if (write_ref_sha1(lock, sha1, msg) < 0)

2
branch.h
View File

@ -14,7 +14,7 @@
*/ */
void create_branch(const char *head, const char *name, const char *start_name, void create_branch(const char *head, const char *name, const char *start_name,
int force, int reflog, int force, int reflog,
int clobber_head, enum branch_track track); int clobber_head, int quiet, enum branch_track track);
/* /*
* Validates that the requested branch may be created, returning the * Validates that the requested branch may be created, returning the

2
builtin/branch.c
View File

@ -808,7 +808,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (kinds != REF_LOCAL_BRANCH) if (kinds != REF_LOCAL_BRANCH)
die(_("-a and -r options to 'git branch' do not make sense with a branch name")); die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
create_branch(head, argv[0], (argc == 2) ? argv[1] : head, create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
force_create, reflog, 0, track); force_create, reflog, 0, 0, track);
} else } else
usage_with_options(builtin_branch_usage, options); usage_with_options(builtin_branch_usage, options);

1
builtin/checkout.c
View File

@ -557,6 +557,7 @@ static void update_refs_for_switch(struct checkout_opts *opts,
opts->new_branch_force ? 1 : 0, opts->new_branch_force ? 1 : 0,
opts->new_branch_log, opts->new_branch_log,
opts->new_branch_force ? 1 : 0, opts->new_branch_force ? 1 : 0,
opts->quiet,
opts->track); opts->track);
new->name = opts->new_branch; new->name = opts->new_branch;
setup_branch_path(new); setup_branch_path(new);