[PATCH 2/2] format-patch: always print diffstat in English
STALE3764d
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:54:34
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- builtin/log.c | 1 + diff.c | 4 ++-- diff.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index ecc2793..62f4b7e 100644
--- a/builtin/log.c
+++ b/builtin/log.c@@ -1225,6 +1225,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) /* Always generate a patch */ rev.diffopt.output_format |= DIFF_FORMAT_PATCH; + rev.diffopt.no_l10n = 1; if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff) DIFF_OPT_SET(&rev.diffopt, BINARY);
diff --git a/diff.c b/diff.c
index 47d7e50..a20cfcc 100644
--- a/diff.c
+++ b/diff.c@@ -1687,7 +1687,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options) extra_shown = 1; } fprintf(options->file, "%s", line_prefix); - print_stat_summary(options->file, 0, total_files, adds, dels); + print_stat_summary(options->file, options->no_l10n, total_files, adds, dels); } static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
@@ -1716,7 +1716,7 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option options->output_prefix_data); fprintf(options->file, "%s", msg->buf); } - print_stat_summary(options->file, 0, total_files, adds, dels); + print_stat_summary(options->file, options->no_l10n, total_files, adds, dels); } static void show_numstat(struct diffstat_t *data, struct diff_options *options)
diff --git a/diff.h b/diff.h
index eec79ef..ea4075d 100644
--- a/diff.h
+++ b/diff.h@@ -125,6 +125,7 @@ struct diff_options { int dirstat_permille; int setup; int abbrev; + int no_l10n; const char *prefix; int prefix_length; const char *stat_sep;
--
1.7.12.rc1.27.g6d3049b.dirty