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 v5 0/3] merge-recursive: option to disable renames
Date: Sat, 20 Feb 2016 23:34:29 -0300 [thread overview]
Message-ID: <1456022072-5342-1-git-send-email-felipegassis@gmail.com> (raw)
Add tests as suggested by Eric Sunshine. Also fixes an inconsitency in the last
part.
Since there were no tests for the --rename-threshold option, I added them in a
separate commit, which is useful in itself.
The other two commits contain the previous patches plus the relevant tests.
For the last part, I made --find-renames (without =<n>) reset the similarity
index to the default, just as in git-diff.
Felipe Gonçalves Assis (3):
merge-recursive: test rename threshold option
merge-recursive: option to disable renames
merge-recursive: more consistent interface
Documentation/merge-strategies.txt | 12 +-
merge-recursive.c | 14 +-
merge-recursive.h | 1 +
...s.sh => t3032-merge-recursive-space-options.sh} | 2 +-
t/t3034-merge-recursive-rename-options.sh | 200 +++++++++++++++++++++
5 files changed, 225 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.342.gf5bb636
next reply other threads:[~2016-02-21 2:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-21 2:34 Felipe Gonçalves Assis [this message]
2016-02-21 2:34 ` [PATCH v5 1/3] merge-recursive: test rename threshold option Felipe Gonçalves Assis
2016-02-21 2:34 ` [PATCH v5 2/3] merge-recursive: option to disable renames Felipe Gonçalves Assis
2016-02-21 2:34 ` [PATCH v5 3/3] merge-recursive: more consistent interface Felipe Gonçalves Assis
2016-02-21 7:40 ` [PATCH v5 0/3] merge-recursive: option to disable renames Junio C Hamano
2016-02-21 15:07 ` Felipe Gonçalves Assis
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=1456022072-5342-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).