mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
builtin rebase: support --quiet
This commit introduces a rebase option `--quiet`. While `--quiet` is commonly perceived as opposite to `--verbose`, this is not the case for the rebase command: both `--quiet` and `--verbose` default to `false` if neither `--quiet` nor `--verbose` is present. Despite the default being `false` for both verbose and quiet mode, passing the `--quiet` option will turn off verbose mode, and `--verbose` will turn off quiet mode. This patch introduces the `flags` bit field, with `REBASE_NO_QUIET` as first user (with many more to come). We do *not* use `REBASE_QUIET` here for an important reason: To keep the implementation simple, this commit introduces `--no-quiet` instead of `--quiet`, so that a single `OPT_NEGBIT()` can turn on quiet mode and turn off verbose and diffstat mode at the same time. Likewise, the companion commit which will introduce support for `--verbose` will have a single `OPT_BIT()` that turns off quiet mode and turns on verbose and diffstat mode at the same time. Signed-off-by: Pratik Karki <predatoramigo@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
06e4775a8c
commit
b4c8eb024a
|
@ -79,6 +79,10 @@ struct rebase_options {
|
|||
int root;
|
||||
struct commit *restrict_revision;
|
||||
int dont_finish_rebase;
|
||||
enum {
|
||||
REBASE_NO_QUIET = 1<<0,
|
||||
} flags;
|
||||
struct strbuf git_am_opt;
|
||||
};
|
||||
|
||||
/* Returns the filename prefixed by the state_dir */
|
||||
|
@ -159,6 +163,9 @@ static int run_specific_rebase(struct rebase_options *opts)
|
|||
add_var(&script_snippet, "revisions", opts->revisions);
|
||||
add_var(&script_snippet, "restrict_revision", opts->restrict_revision ?
|
||||
oid_to_hex(&opts->restrict_revision->object.oid) : NULL);
|
||||
add_var(&script_snippet, "GIT_QUIET",
|
||||
opts->flags & REBASE_NO_QUIET ? "" : "t");
|
||||
add_var(&script_snippet, "git_am_opt", opts->git_am_opt.buf);
|
||||
|
||||
switch (opts->type) {
|
||||
case REBASE_AM:
|
||||
|
@ -308,6 +315,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
{
|
||||
struct rebase_options options = {
|
||||
.type = REBASE_UNSPECIFIED,
|
||||
.flags = REBASE_NO_QUIET,
|
||||
.git_am_opt = STRBUF_INIT,
|
||||
};
|
||||
const char *branch_name;
|
||||
int ret, flags;
|
||||
|
@ -321,6 +330,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
N_("rebase onto given branch instead of upstream")),
|
||||
OPT_BOOL(0, "no-verify", &ok_to_skip_pre_rebase,
|
||||
N_("allow pre-rebase hook to run")),
|
||||
OPT_NEGBIT('q', "quiet", &options.flags,
|
||||
N_("be quiet. implies --no-stat"),
|
||||
REBASE_NO_QUIET),
|
||||
OPT_END(),
|
||||
};
|
||||
|
||||
|
@ -357,6 +369,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
usage_with_options(builtin_rebase_usage,
|
||||
builtin_rebase_options);
|
||||
|
||||
if (!(options.flags & REBASE_NO_QUIET))
|
||||
strbuf_addstr(&options.git_am_opt, " -q");
|
||||
|
||||
switch (options.type) {
|
||||
case REBASE_MERGE:
|
||||
case REBASE_INTERACTIVE:
|
||||
|
|
Loading…
Reference in a new issue