Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-03-05 15:30:14 +0300
committerJunio C Hamano <gitster@pobox.com>2019-03-07 02:02:21 +0300
commitc37d4c0a3c2035a93526fc74904105f607243433 (patch)
tree43d2f8bc28ce53ff7a2bf92e6e92e86831cb8c01 /diff.c
parent4fe016721500c1874fffc25a86e36bd3541c6a38 (diff)
diff-parseopt: convert -a|--text
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/diff.c b/diff.c
index 3a13ba37fd..51d22f63fa 100644
--- a/diff.c
+++ b/diff.c
@@ -5214,6 +5214,8 @@ static void prep_parse_options(struct diff_options *options)
N_("when run from subdir, exclude changes outside and show relative paths"),
PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
diff_opt_relative),
+ OPT_BOOL('a', "text", &options->flags.text,
+ N_("treat all files as text")),
{ OPTION_CALLBACK, 0, "output", options, N_("<file>"),
N_("Output to a specific file"),
PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
@@ -5246,9 +5248,7 @@ int diff_opt_parse(struct diff_options *options,
return ac;
/* flags options */
- if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
- options->flags.text = 1;
- else if (!strcmp(arg, "-R"))
+ if (!strcmp(arg, "-R"))
options->flags.reverse_diff = 1;
else if (!strcmp(arg, "--follow"))
options->flags.follow_renames = 1;