From: Felipe Gonçalves Assis Date: Sun, 21 Feb 2016 15:09:13 GMT Subject: [PATCH 0/5] Tests and fixes for merge-recursive rename options Message-ID: <1456067358-19781-1-git-send-email-felipegassis@gmail.com> This builds on the work in 1b47ad160b55f50a7a98c180e18d80f0f8f17a67 (merge-recursive: more consistent interface, 2016-02-17). Add tests for the merge-recursive rename options, as suggested by Eric Sunshine. Also fixes an inconsistency in the behaviour of find-renames and a typo. The first two commits contain fixes. The tests were divided in the latter three, reproducing the chronological history of the features: 3. --rename-threshold only 4. --rename-threshold and --no-renames 5. --find-renames, --no-renames and deprecated --rename-threshold Felipe Gonçalves Assis (5): merge-recursive: find-renames resets threshold merge-strategies.txt: fix typo merge-recursive: test rename threshold option merge-recursive: test option to disable renames merge-recursive: test more consistent interface 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 | 200 +++++++++++++++++++++ 4 files changed, 206 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.gc9722f8