The expected output from --dirstat=0, is to include any directory with
changes, even if those changes contribute a minuscule portion of the total
changes. However, currently, directories that contribute less than 0.1% are
not included, since their 'permille' value is 0, and there is an
'if (permille)' check in gather_dirstat() that causes them to be ignored.
This test is obviously intended to exclude directories that contribute no
changes whatsoever, but in this case, it hits too broadly. The correct
check is against 'this_dir' from which the permille is calculated. Only if
this value is 0 does the directory truly contribute no changes, and should
be skipped from the output.
This patches fixes this issue, and updates corresponding testcases to
expect the new behvaior.
Signed-off-by: Johan Herland <johan@xxxxxxxxxxx>
---
diff.c | 4 ++--
t/t4046-diff-dirstat.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/diff.c b/diff.c
index abd9cd5..cfbfa92 100644
--- a/diff.c
+++ b/diff.c
@@ -1500,8 +1500,8 @@ static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir,
* under this directory (sources == 1).
*/
if (baselen && sources != 1) {
- int permille = this_dir * 1000 / changed;
- if (permille) {
+ if (this_dir) {
+ int permille = this_dir * 1000 / changed;
int percent = permille / 10;
if (percent >= dir->percent) {
fprintf(opt->file, "%s%4d.%01d%% %.*s\n", line_prefix,
diff --git a/t/t4046-diff-dirstat.sh b/t/t4046-diff-dirstat.sh
index 1690468..694a950 100755
--- a/t/t4046-diff-dirstat.sh
+++ b/t/t4046-diff-dirstat.sh
@@ -337,7 +337,6 @@ test_expect_success 'vanilla --dirstat' '
test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
'
-# rearranged/text falls below 0% threshold (1 / (240 * 9 + 48 + 1) ~= 0.045 %)
cat <<EOF >expect_diff_dirstat
2.1% changed/
10.8% dst/copy/changed/
@@ -346,6 +345,7 @@ cat <<EOF >expect_diff_dirstat
10.8% dst/move/changed/
10.8% dst/move/rearranged/
10.8% dst/move/unchanged/
+ 0.0% rearranged/
10.8% src/move/changed/
10.8% src/move/rearranged/
10.8% src/move/unchanged/
@@ -379,7 +379,6 @@ test_expect_success '--dirstat=0' '
test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
'
-# rearranged/text falls below 0% threshold (1 / (240 * 9 + 48 + 1) ~= 0.045 %)
cat <<EOF >expect_diff_dirstat
2.1% changed/
10.8% dst/copy/changed/
@@ -391,6 +390,7 @@ cat <<EOF >expect_diff_dirstat
10.8% dst/move/unchanged/
32.5% dst/move/
65.1% dst/
+ 0.0% rearranged/
10.8% src/move/changed/
10.8% src/move/rearranged/
10.8% src/move/unchanged/
--
1.7.5.rc1.3.g4d7b
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html