teach "git branch" a --quiet option
There's currently no way to suppress the informational "deleted branch..." or "set up tracking..." messages. This patch provides a "-q" option to do so. 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
d65ddf1984d66e978f0a11e7a4ea2d4eb20193c7
2 files changed
+15
-6
Documentation/git-branch.txt
+5
@@ -126,6 +126,11 @@ OPTIONS
126
relationship to upstream branch (if any). If given twice, print
127
the name of the upstream branch, as well.
128
129
+-q::
130
+--quiet::
131
+ Be more quiet when creating or deleting a branch, suppressing
132
+ non-error messages.
133
+
134
--abbrev=<length>::
135
Alter the sha1's minimum display length in the output listing.
136
The default value is 7 and can be overridden by the `core.abbrev`
builtin/branch.c
+10
-6
@@ -146,7 +146,8 @@ static int branch_merged(int kind, const char *name,
146
return merged;
147
}
148
149
-static int delete_branches(int argc, const char **argv, int force, int kinds)
149
+static int delete_branches(int argc, const char **argv, int force, int kinds,
150
+ int quiet)
151
{
152
struct commit *rev, *head_rev = NULL;
153
unsigned char sha1[20];
@@ -216,9 +217,10 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
217
ret = 1;
218
} else {
219
struct strbuf buf = STRBUF_INIT;
219
- printf(_("Deleted %sbranch %s (was %s).\n"), remote,
220
- bname.buf,
221
- find_unique_abbrev(sha1, DEFAULT_ABBREV));
220
+ if (!quiet)
221
+ printf(_("Deleted %sbranch %s (was %s).\n"),
222
+ remote, bname.buf,
223
+ find_unique_abbrev(sha1, DEFAULT_ABBREV));
224
strbuf_addf(&buf, "branch.%s", bname.buf);
225
if (git_config_rename_section(buf.buf, NULL) < 0)
226
warning(_("Update of config-file failed"));
@@ -678,6 +680,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
680
int delete = 0, rename = 0, force_create = 0, list = 0;
681
int verbose = 0, abbrev = -1, detached = 0;
682
int reflog = 0, edit_description = 0;
683
+ int quiet = 0;
684
enum branch_track track;
685
int kinds = REF_LOCAL_BRANCH;
686
struct commit_list *with_commit = NULL;
@@ -686,6 +689,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
689
OPT_GROUP("Generic options"),
690
OPT__VERBOSE(&verbose,
691
"show hash and subject, give twice for upstream branch"),
692
+ OPT__QUIET(&quiet, "suppress informational messages"),
693
OPT_SET_INT('t', "track", &track, "set up tracking mode (see git-pull(1))",
694
BRANCH_TRACK_EXPLICIT),
695
OPT_SET_INT( 0, "set-upstream", &track, "change upstream info",
@@ -766,7 +770,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
770
abbrev = DEFAULT_ABBREV;
771
772
if (delete)
769
- return delete_branches(argc, argv, delete > 1, kinds);
773
+ return delete_branches(argc, argv, delete > 1, kinds, quiet);
774
else if (list)
775
return print_ref_list(kinds, detached, verbose, abbrev,
776
with_commit, argv);
@@ -808,7 +812,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
812
if (kinds != REF_LOCAL_BRANCH)
813
die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
814
create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
811
- force_create, reflog, 0, 0, track);
815
+ force_create, reflog, 0, quiet, track);
816
} else
817
usage_with_options(builtin_branch_usage, options);
818