diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-03-05 19:30:07 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 08:02:21 +0900 |
| commit | 06f77518db2b6a88ffa27c7d4516840b78ee0d3a (patch) | |
| tree | be576a77bbd615d43db96b79603e523a0e61ff58 /diff.c | |
| parent | 87649a1674a80a0c66b9c17977e7b54c08dd684a (diff) | |
| download | git-06f77518db2b6a88ffa27c7d4516840b78ee0d3a.tar.gz | |
diff-parseopt: convert --[no-]indent-heuristic
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -5124,6 +5124,9 @@ static void prep_parse_options(struct diff_options *options) OPT_BIT_F(0, "ignore-blank-lines", &options->xdl_opts, N_("ignore changes whose lines are all blank"), XDF_IGNORE_BLANK_LINES, PARSE_OPT_NONEG), + OPT_BIT(0, "indent-heuristic", &options->xdl_opts, + N_("heuristic to shift diff hunk boundaries for easy reading"), + XDF_INDENT_HEURISTIC), OPT_GROUP(N_("Diff other options")), OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"), @@ -5162,11 +5165,7 @@ int diff_opt_parse(struct diff_options *options, return ac; /* xdiff options */ - if (!strcmp(arg, "--indent-heuristic")) - DIFF_XDL_SET(options, INDENT_HEURISTIC); - else if (!strcmp(arg, "--no-indent-heuristic")) - DIFF_XDL_CLR(options, INDENT_HEURISTIC); - else if (!strcmp(arg, "--patience")) { + if (!strcmp(arg, "--patience")) { int i; options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF); /* |