This is a reorganisation of the previous series, bundling the test for the fix
along with the commit itself, as suggested by Eric. It also includes many fixes
and improvements pointed out by the same reviewer, whom I thank.
The typo fix is the same as before.
In "add rename threshold tests", I include tests involving --find-renames,
except for one that depends on the fix.
"test option to disable renames" adds tests involving --rename-threshold.
"test deprecated interface" tests the aliasing --rename-threshold.
In "find-renames resets threshold", the specific test for the feature was
bundled along.
To Junio: Please pay special attention to the test of threshold truncation.
Given that it seems to be an undocumented feature, I am not sure whether it
should be included or not.
Felipe Gonçalves Assis (5):
merge-strategies.txt: fix typo
t3034: add rename threshold tests
t3034: test option to disable renames
t3034: test deprecated interface
merge-recursive: find-renames resets threshold
Documentation/merge-strategies.txt | 4 +-
merge-recursive.c | 4 +-
...s.sh => t3032-merge-recursive-space-options.sh} | 2 +-
t/t3034-merge-recursive-rename-options.sh | 235 +++++++++++++++++++++
4 files changed, 241 insertions(+), 4 deletions(-)
rename t/{t3032-merge-recursive-options.sh => t3032-merge-recursive-space-options.sh} (99%)
create mode 100755 t/t3034-merge-recursive-rename-options.sh
--
2.7.1.492.gd821b20
--
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