From: "Felipe Gonçalves Assis" <felipeg.assis@gmail.com>
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, gitster@pobox.com,
sunshine@sunshineco.com,
"Felipe Gonçalves Assis" <felipegassis@gmail.com>
Subject: [PATCH 0/5] Tests and fixes for merge-recursive rename options
Date: Sun, 21 Feb 2016 12:09:13 -0300 [thread overview]
Message-ID: <1456067358-19781-1-git-send-email-felipegassis@gmail.com> (raw)
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
next reply other threads:[~2016-02-21 17:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-21 15:09 Felipe Gonçalves Assis [this message]
2016-02-21 15:09 ` [PATCH 1/5] merge-recursive: find-renames resets threshold Felipe Gonçalves Assis
2016-02-21 17:18 ` Eric Sunshine
2016-02-21 15:09 ` [PATCH 2/5] merge-strategies.txt: fix typo Felipe Gonçalves Assis
2016-02-21 17:21 ` Eric Sunshine
2016-02-21 15:09 ` [PATCH 3/5] merge-recursive: test rename threshold option Felipe Gonçalves Assis
2016-02-21 17:52 ` Eric Sunshine
2016-02-21 18:55 ` Felipe Gonçalves Assis
2016-02-21 20:45 ` Eric Sunshine
2016-02-21 23:15 ` Junio C Hamano
2016-02-21 15:09 ` [PATCH 4/5] merge-recursive: test option to disable renames Felipe Gonçalves Assis
2016-02-21 18:01 ` Eric Sunshine
2016-02-21 15:09 ` [PATCH 5/5] merge-recursive: test more consistent interface Felipe Gonçalves Assis
2016-02-21 18:40 ` Eric Sunshine
2016-02-21 19:55 ` Felipe Gonçalves Assis
2016-02-21 20:32 ` Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456067358-19781-1-git-send-email-felipegassis@gmail.com \
--to=felipeg.assis@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=felipegassis@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).