summaryrefslogtreecommitdiff
path: root/t/t4013-diff-various.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-03 10:29:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-03 10:29:22 -0700
commit5d2a30d7d8777319c745804f040fa405d02169ce (patch)
tree75a490997367dd1b4ea1f8e52db9260a6b6dda2b /t/t4013-diff-various.sh
parentMerge branch 'mm/readme-markdown' (diff)
parentdiff: activate diff.renames by default (diff)
downloadtgif-5d2a30d7d8777319c745804f040fa405d02169ce.tar.xz
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/t4013-diff-various.sh')
-rwxr-xr-xt/t4013-diff-various.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 6ec6072118..94ef5000e7 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -90,6 +90,8 @@ test_expect_success setup '
git commit -m "Rearranged lines in dir/sub" &&
git checkout master &&
+ git config diff.renames false &&
+
git show-branch
'