summaryrefslogtreecommitdiff
path: root/t/t4047-diff-dirstat.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-03 17:29:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-03 17:29:22 (GMT)
commit5d2a30d7d8777319c745804f040fa405d02169ce (patch)
tree75a490997367dd1b4ea1f8e52db9260a6b6dda2b /t/t4047-diff-dirstat.sh
parentf66a5bd9236b19288ad39387ec519a11d65b513d (diff)
parent5404c116aa921d7e2f9408e103c80b7801735d08 (diff)
downloadgit-5d2a30d7d8777319c745804f040fa405d02169ce.zip
git-5d2a30d7d8777319c745804f040fa405d02169ce.tar.gz
git-5d2a30d7d8777319c745804f040fa405d02169ce.tar.bz2
Merge branch 'mm/diff-renames-default'
The end-user facing Porcelain level commands like "diff" and "log" now enables the rename detection by default. * mm/diff-renames-default: diff: activate diff.renames by default log: introduce init_log_defaults() t: add tests for diff.renames (true/false/unset) t4001-diff-rename: wrap file creations in a test Documentation/diff-config: fix description of diff.renames
Diffstat (limited to 't/t4047-diff-dirstat.sh')
-rwxr-xr-xt/t4047-diff-dirstat.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh
index 3b8b792..447a8ff 100755
--- a/t/t4047-diff-dirstat.sh
+++ b/t/t4047-diff-dirstat.sh
@@ -248,7 +248,8 @@ EOF
git rm -r src/move/unchanged &&
git rm -r src/move/changed &&
git rm -r src/move/rearranged &&
- git commit -m "changes"
+ git commit -m "changes" &&
+ git config diff.renames false
'
cat <<EOF >expect_diff_stat