mirror of
https://github.com/git/git.git
synced 2026-01-09 17:46:37 +00:00
whatchanged: require --i-still-use-this
The documentation of "git whatchanged" is pretty explicit that the command was retained for historical reasons to help those whose fingers cannot be retrained. Let's see if they still are finding it hard to type "git log --raw" instead of "git whatchanged" by marking the command as "nominated for removal", and require "--i-still-use-this" on the command line. Adjust the tests so that the option is passed when we invoke the command. In addition, we test that the command fails when "--i-still-use-this" is not given. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
@@ -113,6 +113,13 @@ struct log_config {
|
||||
int fmt_patch_name_max;
|
||||
char *fmt_pretty;
|
||||
char *default_date_mode;
|
||||
|
||||
/*
|
||||
* Note: git_log_config() does not touch this member and that
|
||||
* is very deliberate. This member is only to be used to
|
||||
* resurrect whatchanged that is deprecated.
|
||||
*/
|
||||
int i_still_use_this;
|
||||
};
|
||||
|
||||
static void log_config_init(struct log_config *cfg)
|
||||
@@ -267,6 +274,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
|
||||
OPT__QUIET(&quiet, N_("suppress diff output")),
|
||||
OPT_BOOL(0, "source", &source, N_("show source")),
|
||||
OPT_BOOL(0, "use-mailmap", &mailmap, N_("use mail map file")),
|
||||
OPT_HIDDEN_BOOL(0, "i-still-use-this", &cfg->i_still_use_this,
|
||||
"<use this deprecated command>"),
|
||||
OPT_ALIAS(0, "mailmap", "use-mailmap"),
|
||||
OPT_CALLBACK_F(0, "clear-decorations", NULL, NULL,
|
||||
N_("clear all previously-defined decoration filters"),
|
||||
@@ -656,6 +665,10 @@ int cmd_whatchanged(int argc,
|
||||
opt.def = "HEAD";
|
||||
opt.revarg_opt = REVARG_COMMITTISH;
|
||||
cmd_log_init(argc, argv, prefix, &rev, &opt, &cfg);
|
||||
|
||||
if (!cfg.i_still_use_this)
|
||||
you_still_use_that("git whatchanged");
|
||||
|
||||
if (!rev.diffopt.output_format)
|
||||
rev.diffopt.output_format = DIFF_FORMAT_RAW;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user