зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
8ced9c90a2
Коммит
f9a482e62b
9
branch.c
9
branch.c
|
@ -101,9 +101,10 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
|
|||
* config.
|
||||
*/
|
||||
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;
|
||||
int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
|
||||
|
||||
if (strlen(new_ref) > 1024 - 7 - 7 - 1)
|
||||
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",
|
||||
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);
|
||||
|
||||
free(tracking.src);
|
||||
|
@ -191,7 +192,7 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
|
|||
void create_branch(const char *head,
|
||||
const char *name, const char *start_name,
|
||||
int force, int reflog, int clobber_head,
|
||||
enum branch_track track)
|
||||
int quiet, enum branch_track track)
|
||||
{
|
||||
struct ref_lock *lock = NULL;
|
||||
struct commit *commit;
|
||||
|
@ -260,7 +261,7 @@ void create_branch(const char *head,
|
|||
start_name);
|
||||
|
||||
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 (write_ref_sha1(lock, sha1, msg) < 0)
|
||||
|
|
2
branch.h
2
branch.h
|
@ -14,7 +14,7 @@
|
|||
*/
|
||||
void create_branch(const char *head, const char *name, const char *start_name,
|
||||
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
|
||||
|
|
|
@ -808,7 +808,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
|
|||
if (kinds != REF_LOCAL_BRANCH)
|
||||
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,
|
||||
force_create, reflog, 0, track);
|
||||
force_create, reflog, 0, 0, track);
|
||||
} else
|
||||
usage_with_options(builtin_branch_usage, options);
|
||||
|
||||
|
|
|
@ -557,6 +557,7 @@ static void update_refs_for_switch(struct checkout_opts *opts,
|
|||
opts->new_branch_force ? 1 : 0,
|
||||
opts->new_branch_log,
|
||||
opts->new_branch_force ? 1 : 0,
|
||||
opts->quiet,
|
||||
opts->track);
|
||||
new->name = opts->new_branch;
|
||||
setup_branch_path(new);
|
||||
|
|
Загрузка…
Ссылка в новой задаче