зеркало из https://github.com/microsoft/git.git
General --quiet improvements
'git reset' is missing --quiet, and 'git gc' is not using OPT__QUIET. Let's fix that. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
b809d9cd07
Коммит
5d2dcc423e
|
@ -62,6 +62,7 @@ This means that `git reset -p` is the opposite of `git add -p` (see
|
|||
linkgit:git-add[1]).
|
||||
|
||||
-q::
|
||||
--quiet::
|
||||
Be quiet, only report errors.
|
||||
|
||||
<commit>::
|
||||
|
|
|
@ -180,12 +180,12 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
|
|||
char buf[80];
|
||||
|
||||
struct option builtin_gc_options[] = {
|
||||
OPT__QUIET(&quiet),
|
||||
{ OPTION_STRING, 0, "prune", &prune_expire, "date",
|
||||
"prune unreferenced objects",
|
||||
PARSE_OPT_OPTARG, NULL, (intptr_t)prune_expire },
|
||||
OPT_BOOLEAN(0, "aggressive", &aggressive, "be more thorough (increased runtime)"),
|
||||
OPT_BOOLEAN(0, "auto", &auto_gc, "enable auto-gc mode"),
|
||||
OPT_BOOLEAN('q', "quiet", &quiet, "suppress progress reports"),
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
|
|
|
@ -202,6 +202,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
|
|||
struct commit *commit;
|
||||
char *reflog_action, msg[1024];
|
||||
const struct option options[] = {
|
||||
OPT__QUIET(&quiet),
|
||||
OPT_SET_INT(0, "mixed", &reset_type,
|
||||
"reset HEAD and index", MIXED),
|
||||
OPT_SET_INT(0, "soft", &reset_type, "reset only HEAD", SOFT),
|
||||
|
@ -209,8 +210,6 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
|
|||
"reset HEAD, index and working tree", HARD),
|
||||
OPT_SET_INT(0, "merge", &reset_type,
|
||||
"reset HEAD, index and working tree", MERGE),
|
||||
OPT_BOOLEAN('q', NULL, &quiet,
|
||||
"disable showing new HEAD in hard reset and progress message"),
|
||||
OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks interactively"),
|
||||
OPT_END()
|
||||
};
|
||||
|
|
Загрузка…
Ссылка в новой задаче