]> git.ipfire.org Git - thirdparty/git.git/commit - t/t3032-merge-recursive-space-options.sh
t3034: add rename threshold tests
authorFelipe Gonçalves Assis <felipeg.assis@gmail.com>
Wed, 24 Feb 2016 01:41:29 +0000 (22:41 -0300)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Feb 2016 22:45:28 +0000 (14:45 -0800)
commit63651e1a13f29abcffb1d197f3388924318d59d3
treee514eb37dbc4e3ff078d816d1e5117f42dfb5950
parent87892f605be16037bc910ca2cf9fa21bb9467f5e
t3034: add rename threshold tests

10ae752 (merge-recursive: option to specify rename threshold,
2010-09-27) introduced this feature but did not include any tests.

The tests use the new option --find-renames, which replaces the then
introduced and now deprecated option --rename-threshold.

Also update name and description of t3032 for consistency:
"merge-recursive options" -> "merge-recursive space options"

Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3032-merge-recursive-space-options.sh [moved from t/t3032-merge-recursive-options.sh with 99% similarity]
t/t3034-merge-recursive-rename-options.sh [new file with mode: 0755]