diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-29 21:01:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-29 21:01:21 (GMT) |
| commit | ac4089da7bcf63698c239a16076a144e66de96a9 (patch) | |
| tree | 728c1de5f67394b258737eff5a833db7e26e313c /t | |
| parent | 71a9b82dd4ecc167caa099ea9e8ab6138a65f5fb (diff) | |
| parent | ff0c7fa8cbd7f7d5e81c2501222b60f0aac30bb9 (diff) | |
| download | git-ac4089da7bcf63698c239a16076a144e66de96a9.zip git-ac4089da7bcf63698c239a16076a144e66de96a9.tar.gz git-ac4089da7bcf63698c239a16076a144e66de96a9.tar.bz2 | |
Merge branch 'tg/range-diff-same-file-fix'
"git range-diff" showed incorrect diffstat, which has been
corrected.
* tg/range-diff-same-file-fix:
diff: fix modified lines stats with --stat and --numstat
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3206-range-diff.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index e024cff..6eb344b 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -252,17 +252,13 @@ test_expect_success 'changed commit with --stat diff option' ' git range-diff --no-color --stat topic...changed >actual && cat >expect <<-EOF && 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/ - a => b | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/ - a => b | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/ - a => b | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) + a => b | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ - a => b | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) + a => b | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) EOF test_cmp expect actual ' |