summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-13 18:01:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-13 18:01:32 (GMT)
commitdf54e2bfd6afd0e7dcf5c658c92f469fdd1b06ff (patch)
treebfd1691bef3f64bd6b05616d2b80a3eeeadad6f3 /diff.h
parentf7d59e256884f63adeed9a1f3376a386a28681ff (diff)
parent7478ac57c4b5cd589cb134d88e8cd78db1247b30 (diff)
downloadgit-df54e2bfd6afd0e7dcf5c658c92f469fdd1b06ff.zip
git-df54e2bfd6afd0e7dcf5c658c92f469fdd1b06ff.tar.gz
git-df54e2bfd6afd0e7dcf5c658c92f469fdd1b06ff.tar.bz2
Merge branch 'jh/dirstat-lines'
* jh/dirstat-lines: Mark dirstat error messages for translation Improve error handling when parsing dirstat parameters New --dirstat=lines mode, doing dirstat analysis based on diffstat Allow specifying --dirstat cut-off percentage as a floating point number Add config variable for specifying default --dirstat behavior Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file Make --dirstat=0 output directories that contribute < 0.1% of changes Add several testcases for --dirstat and friends
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index d83e53e..adb40ba 100644
--- a/diff.h
+++ b/diff.h
@@ -78,6 +78,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
+#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
#define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
@@ -114,7 +115,7 @@ struct diff_options {
int needed_rename_limit;
int degraded_cc_to_c;
int show_rename_progress;
- int dirstat_percent;
+ int dirstat_permille;
int setup;
int abbrev;
const char *prefix;