Re: [PATCH 1/5] Documentation/diff-config: fix description of diff.renames

Matthieu Moy imag.fr> writes: > diff.renames:: > - Tells Git to detect renames. If set to any boolean value, it > - will enable basic rename detection. If set to "copies" or > - "copy", it will detect copies, as well. > + Whether and how Git detects renames. If set to

Re: [PATCH v3 0/3] Tests for merge-recursive rename-options

On 23 February 2016 at 22:41, Felipe Gonçalves Assis <felipeg.as...@gmail.com> wrote: > Just a quick update incorporating Eric's latest comments. > > Still based on > c443d39 (merge-recursive: find-renames resets threshold, 2016-02-21). > One thing I just noticed is

[PATCH v3 3/3] t3034: test deprecated interface

From: Felipe Gonçalves Assis <felipeg.as...@gmail.com> --find-renames= and --rename-threshold= should be aliases. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- t/t3034-merge-recursive-rename-options.sh | 46 +++ 1 file changed, 4

[PATCH v3 2/3] t3034: test option to disable renames

From: Felipe Gonçalves Assis <felipeg.as...@gmail.com> Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- t/t3034-merge-recursive-rename-options.sh | 28 1 file changed, 28 insertions(+) diff --git a/t/t3034-merge-recursive-rename-opt

[PATCH v3 0/3] Tests for merge-recursive rename-options

Just a quick update incorporating Eric's latest comments. Still based on c443d39 (merge-recursive: find-renames resets threshold, 2016-02-21). Felipe Gonçalves Assis (3): t3034: add rename threshold tests t3034: test option to disable renames t3034: test deprecated interface ...s.sh

[PATCH v3 1/3] t3034: add rename threshold tests

From: Felipe Gonçalves Assis <felipeg.as...@gmail.com> 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

Re: [PATCH 1/3] t3034: add rename threshold tests

On 23 February 2016 at 21:50, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Tue, Feb 23, 2016 at 6:48 PM, Felipe Gonçalves Assis > <felipeg.as...@gmail.com> wrote: >> 10ae752 (merge-recursive: option to specify rename threshold, >> 2010-09-27) introduced this f

[PATCH 2/3] t3034: test option to disable renames

From: Felipe Gonçalves Assis <felipeg.as...@gmail.com> Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- t/t3034-merge-recursive-rename-options.sh | 28 1 file changed, 28 insertions(+) diff --git a/t/t3034-merge-recursive-rename-opt

[PATCH 3/3] t3034: test deprecated interface

From: Felipe Gonçalves Assis <felipeg.as...@gmail.com> --find-renames= and --rename-threshold= should be aliases. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- t/t3034-merge-recursive-rename-options.sh | 46 +++ 1 file changed, 4

[PATCH 1/3] t3034: add rename threshold tests

From: Felipe Gonçalves Assis <felipeg.as...@gmail.com> 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

[PATCH v2 0/3] Tests for merge-recursive rename options

Get rid of blatant bash-isms in favour of simple and portable constructions. Felipe Gonçalves Assis (3): t3034: add rename threshold tests t3034: test option to disable renames t3034: test deprecated interface ...s.sh => t3032-merge-recursive-space-options.sh} | 2 +- t/t3034-me

[PATCH 3/3] t3034: test deprecated interface

--find-renames= and --rename-threshold= should be aliases. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- t/t3034-merge-recursive-rename-options.sh | 46 +++ 1 file changed, 46 insertions(+) diff --git a/t/t3034-merge-recursive-rename-opti

[PATCH 2/3] t3034: test option to disable renames

Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- t/t3034-merge-recursive-rename-options.sh | 28 1 file changed, 28 insertions(+) diff --git a/t/t3034-merge-recursive-rename-options.sh b/t/t3034-merge-recursive-rename-options.sh index 6

[PATCH 1/3] t3034: add rename threshold tests

for consistency: "merge-recursive options" -> "merge-recursive space options" Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- ...s.sh => t3032-merge-recursive-space-options.sh} | 2 +- t/t3034-merge-recursive-rename-options.sh | 23

[PATCH 0/3] Tests for merge-recursive rename options

Gonçalves Assis (3): t3034: add rename threshold tests t3034: test option to disable renames t3034: test deprecated interface ...s.sh => t3032-merge-recursive-space-options.sh} | 2 +- t/t3034-merge-recursive-rename-options.sh | 309 + 2 files changed, 310 inserti

Re: [PATCH v2 0/5] Tests and fixes for merge-recursive rename options

On 22 February 2016 at 19:29, Junio C Hamano <gits...@pobox.com> wrote: > Felipe Gonçalves Assis <felipeg.as...@gmail.com> writes: > >>> As I said, I am reluctant to take the 25%/50%/75% tests in their >>> current form. Let me take the first one and a half

Re: [PATCH v2 0/5] Tests and fixes for merge-recursive rename options

On 22 February 2016 at 18:00, Junio C Hamano <gits...@pobox.com> wrote: > "Felipe Gonçalves Assis" <felipeg.as...@gmail.com> writes: > >> This is a reorganisation of the previous series, bundling the test for the >> fix >> along with the commit itsel

[PATCH v2 1/5] merge-strategies.txt: fix typo

Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- Documentation/merge-strategies.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index ff359b6..2eb92b9 100644 --- a/Documen

[PATCH v2 2/5] t3034: add rename threshold tests

for consistency: "merge-recursive options" -> "merge-recursive space options" Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- Now this already introduces the final names and descriptions for the tests. The test for threshold truncation was kept fo

[PATCH v2 3/5] t3034: test option to disable renames

Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- t/t3034-merge-recursive-rename-options.sh | 28 1 file changed, 28 insertions(+) diff --git a/t/t3034-merge-recursive-rename-options.sh b/t/t3034-merge-recursive-rename-options.sh index 7

[PATCH v2 0/5] Tests and fixes for merge-recursive rename options

quot;, 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 t

[PATCH v2 4/5] t3034: test deprecated interface

--find-renames= and --rename-threshold= should be aliases. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- Now includes tests with invalid arguments to --rename-threshold= t/t3034-merge-recursive-rename-options.sh | 42 +++ 1 file chang

[PATCH v2 5/5] merge-recursive: find-renames resets threshold

Make the find-renames option follow the behaviour in git-diff, where it resets the threshold when none is given. So, for instance, "--find-renames=25 --find-renames" should result in the default threshold (50%) instead of 25%. Add corresponding test. Signed-off-by: Felipe Gonça

Re: [PATCH 5/5] merge-recursive: test more consistent interface

On 21 February 2016 at 15:40, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Sun, Feb 21, 2016 at 10:09 AM, Felipe Gonçalves Assis > <felipeg.as...@gmail.com> wrote: >> merge-recursive: test more consistent interface > > The real meat of this patch (it seem

Re: [PATCH 3/5] merge-recursive: test rename threshold option

On 21 February 2016 at 14:52, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Sun, Feb 21, 2016 at 10:09 AM, Felipe Gonçalves Assis > <felipeg.as...@gmail.com> wrote: >> merge-recursive: test rename threshold option > >> + git read-tree --reset -u HEAD

[PATCH 2/5] merge-strategies.txt: fix typo

Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- Documentation/merge-strategies.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index ff359b6..2eb92b9 100644 --- a/Documen

[PATCH 1/5] merge-recursive: find-renames resets threshold

Make the find-renames option follow the behaviour in git-diff, where it resets the threshold when none is given. So, for instance, "--find-renames=25 --find-renames" should result in the default threshold (50%) instead of 25%. Signed-off-by: Felipe Gonçalves Assis <felipegas

[PATCH 5/5] merge-recursive: test more consistent interface

Update basic tests to use the new option find-renames instead of rename-threshold. Add tests to verify that rename-threshold= behaves as a synonym for find-renames=. Test that find-renames resets threshold. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- t/t3034

[PATCH 4/5] merge-recursive: test option to disable renames

Also update name and description of tests for consistency: "merge-recursive options" -> "merge-recursive space options" "merge-recursive rename threshold" -> "merge-recursive rename options" Signed-off-by: Felipe Gonçalves Assis <feli

[PATCH 3/5] merge-recursive: test rename threshold option

Commit 10ae7526bebb505ba01f76ec97d5f7b5e0e5 introduced this feature, but did not include any tests. This commit fixes this. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- t/t3034-merge-recursive-rename-threshold.sh | 146 1 file change

[PATCH 0/5] Tests and fixes for merge-recursive rename options

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

Re: [PATCH v5 0/3] merge-recursive: option to disable renames

On 21 February 2016 at 04:40, Junio C Hamano wrote: > Yikes, your previous round is already in 'next', so could you make > this series an incremental on top of what is already queued up to > 1b47ad16 (merge-recursive: more consistent interface, 2016-02-17)? > > Thanks. > Oh,

[PATCH v5 1/3] merge-recursive: test rename threshold option

Commit 10ae7526bebb505ba01f76ec97d5f7b5e0e5 introduced this feature, but did not include any tests. This commit fixes this. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- This commit is independent of the proposed feature, so it might be of interest even if th

[PATCH v5 2/3] merge-recursive: option to disable renames

The recursive strategy turns on rename detection by default. Add a strategy option to disable rename detection even for exact renames. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- Added tests. For consistent naming, I renamed and slightly edited the test of whit

[PATCH v5 3/3] merge-recursive: more consistent interface

Add strategy option find-renames, following git-diff interface. This makes the option rename-threshold redundant. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- Added tests and made --find-renames reset the similarity index to the default. Documentation/merge-strategi

[PATCH v5 0/3] merge-recursive: option to disable renames

. For the last part, I made --find-renames (without =) 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

Re: [PATCH v3 0/2] merge-recursive: option to disable renames

On 16 February 2016 at 23:37, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis > <felipeg.as...@gmail.com> wrote: >> No more renames option. rename-threshold enables renames. > > Can you add some tests? Off

[PATCH v4 0/2] merge-recursive: option to disable renames

Incorporate documentation input from Eric Sunshine. Fix missing signoff. The first part is unchanged. No tests are included for now. This work is being done in parallel and should be properly included in future proposals. Felipe Gonçalves Assis (2): merge-recursive: option to disable renames

[PATCH v4 1/2] merge-recursive: option to disable renames

The recursive strategy turns on rename detection by default. Add a strategy option to disable rename detection even for exact renames. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- Documentation/merge-strategies.txt | 6 ++ merge-recursive.c

[PATCH v4 2/2] merge-recursive: more consistent interface

Add strategy option find-renames, following git-diff interface. This makes the option rename-threshold redundant. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- Documentation/merge-strategies.txt | 10 ++ merge-recursive.c | 5 - 2 files c

Re: [PATCH v3 1/2] merge-recursive: option to disable renames

On 16 February 2016 at 23:41, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis > <felipeg.as...@gmail.com> wrote: >> The recursive strategy turns on rename detection by default. Add a >> strategy option to

[PATCH v3 1/2] merge-recursive: option to disable renames

The recursive strategy turns on rename detection by default. Add a strategy option to disable rename detection even for exact renames. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- Documentation/merge-strategies.txt | 6 ++ merge-recursive.c

[PATCH v3 0/2] merge-recursive: option to disable renames

No more renames option. rename-threshold enables renames. detect_rename is now a simple boolean. Its value is no longer linked to DIFF_ANYTHING symbol. A second optional patch is included, teaching merge-recursive to take "find-renames[=]" as well, for consistency. Felipe Gonçalve

[PATCH v3 2/2] merge-recursive: more consistent interface

Add strategy option find-renames, following git-diff interface. This makes the option rename-threshold redundant. --- A minor note git diff --check complains about an indent with spaces here, but I think I did the right thing: indented with tabs and aligned with spaces. If desired, I can align

[PATCH v2] merge-recursive: option to disable renames

The recursive strategy turns on rename detection by default. Add a strategy option to disable rename detection even for exact renames. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- Following Hamano's review, this patch includes a strategy option "renames"

Re: [PATCH] merge-recursive: option to disable renames

On 16 February 2016 at 19:49, Junio C Hamano <gits...@pobox.com> wrote: > "Felipe Gonçalves Assis" <felipeg.as...@gmail.com> writes: > >> +no-renames;; >> + Turn off rename detection. >> + See also linkgit:git-diff[1] `--no-renames`.

Re: Custom merge driver with no rename detection

On 15 February 2016 at 09:03, Junio C Hamano <gits...@pobox.com> wrote: > Felipe Gonçalves Assis <felipeg.as...@gmail.com> writes: > >> However, if you do find this approach acceptable/desirable >> (rename-threshold > 100%), I can work on the issues pointed

[PATCH] merge-recursive: option to disable renames

The recursive strategy turns on rename detection by default. Add a strategy option to disable rename detection even for exact renames. Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com> --- Hi, this is a patch relative to the "Custom merge driver with no rename detect

Re: Custom merge driver with no rename detection

On 15 February 2016 at 06:06, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Felipe, > > On Sun, 14 Feb 2016, Felipe Gonçalves Assis wrote: > >> Attached is a quick and dirty patch that emulates the effect by >> allowing greater than 100% rename

Custom merge driver with no rename detection

river-with-no-rename-detection Thanks in advance for any attention provided. Regards, Felipe Gonçalves Assis From bcef6c44fac3a29afe03408ef27024776da861ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Gon=C3=A7alves=20Assis?= <felipegas...@gmail.com> Date: Sun, 14 Feb 2016 17:02:00