[PATCH v2 0/5] Tests and fixes for merge-recursive rename options
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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 0/5] Tests and fixes for merge-recursive rename options
"Felipe Gonçalves Assis" writes: > 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 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 of the last one (i.e. excluding the test) for now. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 0/5] Tests and fixes for merge-recursive rename options
On 22 February 2016 at 18:00, Junio C Hamano wrote: > "Felipe Gonçalves Assis" writes: > >> 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 > > 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 of the last one > (i.e. excluding the test) for now. > > Thanks. Ok, should I post a new version of the patch without the tests while I rework them or does that mean that you have already filtered them out locally? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 0/5] Tests and fixes for merge-recursive rename options
Felipe Gonçalves Assis 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 of the last one >> (i.e. excluding the test) for now. >> >> Thanks. > > Ok, should I post a new version of the patch without the tests while I > rework them or does that mean that you have already filtered them out > locally? I already have and queued them tentatively as c443d39 merge-recursive: find-renames resets threshold 83837ec merge-strategies.txt: fix typo but they haven't been merged to 'next', so it is up to you whether you rebuild the remainder on top of c443d39 or redo these 5 patches altogether (just tell me to drop these two if you go the latter route). Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 0/5] Tests and fixes for merge-recursive rename options
On 22 February 2016 at 19:29, Junio C Hamano wrote: > Felipe Gonçalves Assis 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 of the last one >>> (i.e. excluding the test) for now. >>> >>> Thanks. >> >> Ok, should I post a new version of the patch without the tests while I >> rework them or does that mean that you have already filtered them out >> locally? > > I already have and queued them tentatively as > > c443d39 merge-recursive: find-renames resets threshold > 83837ec merge-strategies.txt: fix typo > > but they haven't been merged to 'next', so it is up to you whether > you rebuild the remainder on top of c443d39 or redo these 5 patches > altogether (just tell me to drop these two if you go the latter > route). > My original patch started with exactly those commits and then added the tests, so it is fine for me. The motivation for the reorganisation was bundling the relevant test with the fix, but then it might be better to publish the fix soon, right? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
