Re: [PATCH 13/14] completion: add default options

On Mon, Jun 24, 2019 at 12:22 PM Junio C Hamano wrote: > > Duy Nguyen writes: > > > On Sat, Jun 22, 2019 at 5:31 AM Felipe Contreras > > wrote: > >> > >> Versions of Git older than v2.17 don't know about > >> --git

Re: [PATCH 14/14] completion: add default merge strategies

On Mon, Jun 24, 2019 at 12:24 PM Junio C Hamano wrote: > > Felipe Contreras writes: > > > In case the command fails. > > It is unclear what you wanted to say with this. What command? > After "git merge" fails? Yes. The command that __git_list_merge_strategie

Re: [PATCH 01/14] completion: zsh: fix __gitcomp_direct()

On Fri, Jun 21, 2019 at 5:31 PM Felipe Contreras wrote: > > Many callers append a space suffix, but zsh automatically appends a > space, making the completion add two spaces, for example: > --- a/contrib/completion/git-completion.zsh > +++ b/contrib/completion/git-completion.zsh &

Re: [PATCH 13/14] completion: add default options

On Fri, Jun 21, 2019 at 10:02 PM Duy Nguyen wrote: > > On Sat, Jun 22, 2019 at 5:31 AM Felipe Contreras > wrote: > > > > Versions of Git older than v2.17 don't know about > > --git-completion-helper, so provide some defaults for them. > > > > Also, som

[PATCH 02/14] completion: zsh: fix for directories with spaces

Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 0d66c27366..034cfa9e8f 100644 --- a/contrib/completion/git

[PATCH 04/14] completion: zsh: improve main function selection

Sometimes we want to use the function directly (e.g. _git_checkout), for example when zsh has the option 'complete_aliases', this way, we can do something like: compdef _git gco=git_checkout Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 4 +++- 1 file

[PATCH 11/14] test: completion: tests for __gitcomp regression

run it outside a git repository. You might change to a directory that has a git repository, but it's too late, because the empty options have been cached. It's unclear how many commands are affected, but this patch attempts to at least detect some already in the testing framewor

[PATCH 03/14] completion: remove zsh hack

We don't want to override the 'complete()' function in zsh, which can be used by bashcomp. Reported-by: Mark Lodato Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 1 + contrib/completion/git-completion.zsh | 6 -- 2 files changed, 1 insertion(

[PATCH 14/14] completion: add default merge strategies

In case the command fails. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 4 +++- t/t9902-completion.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git

[PATCH 01/14] completion: zsh: fix __gitcomp_direct()

Many callers append a space suffix, but zsh automatically appends a space, making the completion add two spaces, for example: git log ma Will complete 'master '. Let's remove that extra space. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash

[PATCH 05/14] completion: prompt: fix color for Zsh

We don't need PROMPT_COMMAND in Zsh; we are already using %F{color} %f, which in turn use %{ and %}, which are the equivalent of Bash's \[ and \]. We can use as many colors as we want and output directly into PS1 (or RPS1) without the risk of buffer wrapping issues. Signed-off-

[PATCH 00/14] completion: a bunch of updates

Hi, Here's another try at completion fixes, cleanups, and more tests. Some of these have already been sent. Felipe Contreras (14): completion: zsh: fix __gitcomp_direct() completion: zsh: fix for directories with spaces completion: remove zsh hack completion: zsh: improve main fun

[PATCH 10/14] completion: zsh: trivial cleanups

We don't need to override IFS, zsh has a native way of splitting by new lines: the expansion flag (f). Also, we don't need to split files by ':' or '='; that's only for words. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 18 ++

[PATCH 08/14] completion: bash: remove old compat wrappers

It's been seven years, probably more than enough time to move on. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 12 1 file changed, 12 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash

[PATCH 13/14] completion: add default options

Versions of Git older than v2.17 don't know about --git-completion-helper, so provide some defaults for them. Also, some commands fail if there's no Git repository available. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 97 +

[PATCH 12/14] test: completion: use global config

When appropriate. Signed-off-by: Felipe Contreras --- t/t9902-completion.sh | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 7bef41eaf5..3dbfef6960 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh

[PATCH 09/14] completion: bash: remove zsh wrapper

It has been deprecated for more than seven years. It's time to move on. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 84 +- 1 file changed, 2 insertions(+), 82 deletions(-) diff --git a/contrib/completion/git-completion.bash b/co

[PATCH 07/14] completion: zsh: update installation instructions

r wherever you want). Also, update the default locations of the system bash-completion, including the default bash-completion location for user scripts, and the recommended way to find the system location (with pkg-config) Signed-off-by: Felipe Contreras --- contrib/completion/git-completio

[PATCH 06/14] completion: bash: cleanup cygwin check

Avoid Yoda conditions, and use $OSTYPE. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 676b19a983

[PATCH 2/5] completion: zsh: fix for directories with spaces

Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index b3c4588515..067738d93f 100644 --- a/contrib/completion/git

[PATCH 5/5] completion: prompt: fix color for Zsh

We don't need PROMPT_COMMAND in Zsh; we are already using %F{color} %f, which in turn use %{ and %}, which are the equivalent of Bash's \[ and \]. We can use as many colors as we want and output directly into PS1 (or RPS1) without the risk of buffer wrapping issues. Signed-off-

[PATCH 1/5] completion: zsh: update installation instructions

nt). Also, update the default locations of the system bash-completion. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/comp

[PATCH 4/5] completion: zsh: improve main function selection

Sometimes we want to use the function directly (e.g. _git_checkout), for example when zsh has the option 'complete_aliases', this way, we can do something like: compdef _git gco=git_checkout Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 4 +++- 1 file

[PATCH 0/5] contrib: completion: general zsh updates

Helo, These patches are definitely needed, and some of these have been cooking for years in oh-my-zsh. Felipe Contreras (5): completion: zsh: update installation instructions completion: zsh: fix for directories with spaces completion: remove zsh hack completion: zsh: improve main

[PATCH 3/5] completion: remove zsh hack

We don't want to override the 'complete()' function in zsh, which can be used by bashcomp. Reported-by: Mark Lodato Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 1 + contrib/completion/git-completion.zsh | 6 -- 2 files changed, 1 insertion(

Re: [PATCH] completion: do not cache if --git-completion-helper fails

On Thu, Jun 13, 2019 at 9:53 PM Duy Nguyen wrote: > > On Fri, Jun 14, 2019 at 7:30 AM Felipe Contreras > wrote: > > One way or the other, shouldn't my tests be merged? The issue is still > > there, and it's nice to have tests for that. > > Is there any good

Re: [PATCH] completion: do not cache if --git-completion-helper fails

On Wed, Jun 12, 2019 at 3:52 AM Duy Nguyen wrote: > > On Sat, Jun 8, 2019 at 12:33 AM Felipe Contreras > wrote: > > Something like this should work: > > > > struct command checkout_command = { > > .name = "checkout", > > .function = cmd_checko

Re: [PATCH] completion: do not cache if --git-completion-helper fails

les"), .options = { OPT__QUIET(&opts.quiet, N_("suppress progress reporting")), ... }, } This way we could run parse_options_show_gitcomp() from git.c and not worry about whatever cmd_checkout() needs. This has the added advantage that it gathers information about this command that is stray in multiple sources (git.c, command-list.h), and it makes builtin.h cleaner too. Plus, we could rework the way -h works too. -- Felipe Contreras

[PATCH] test: completion: tests for __gitcomp regression

run it outside a git repository. You might change to a directory that has a git repository, but it's too late, because the empty options have been cached. It's unclear how many commands are affected, but this patch attempts to at least detect some already in the testing framewor

Re: [PATCH] completion (zsh): fix misleading install location

ed way to install this script is to copy to '~/.zsh/_git/', > +# and then add the following to your ~/.zshrc file: ~/.zsh/_git should be a file, not a directory. -- Felipe Contreras

[PATCH] completion: zsh: update installation instructions

nt). Also, update the default locations of the system bash-completion. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/comp

[PATCHt2] completion: prompt: fix for Zsh

We can add colour in Zsh without the need of pcmode. Signed-off-by: Felipe Contreras --- contrib/completion/git-prompt.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 983e419d2b..fd2b049dbd

Re: [RFC/PATCH 0/5] Fix fetch regression with transport helpers

On Tue, Jun 4, 2019 at 9:35 AM Jeff King wrote: > > On Mon, Jun 03, 2019 at 09:13:25PM -0500, Felipe Contreras wrote: > > I'm not exactly sure the solution is the one we want, but hopefull it gives > > an > > idea as to what is needed. > > It looks good to

[RFC/PATCH 5/5] fetch: fix regression with transport helpers

helper the oids can certainly be null. So now tags are ignored and fetching them is impossible. This patch fixes that by having a specific flag that is set only when we explicitly want to ignore the refs, restoring the original behavior. Signed-off-by: Felipe Contreras --- builtin/fetch.c

[RFC/PATCH 4/5] fetch: make the code more understandable

The comment makes it seem as if the condition is the other way around. The exception is when the oid is null, so check for that. Signed-off-by: Felipe Contreras --- builtin/fetch.c | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/builtin/fetch.c b/builtin

[RFC/PATCH 3/5] fetch: trivial cleanup

Create a helper function to clear an item. The way items are cleared has changed, and will change again soon. No functional changes. Signed-off-by: Felipe Contreras --- builtin/fetch.c | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/builtin/fetch.c b/builtin

[RFC/PATCH 2/5] t5801 (remote-helpers): add test to fetch tags

This used to work, but commit e198b3a740 broke it. e198b3a740 (fetch: replace string-list used as a look-up table with a hashmap) Probably all remote helpers that use the import method are affected, but we didn't catch the issue. Signed-off-by: Felipe Contreras --- t/t5801-remote-helpe

[RFC/PATCH 1/5] t5801 (remote-helpers): cleanup refspec stuff

The code is much simpler this way, specially thanks to: git fast-export --refspec Signed-off-by: Felipe Contreras --- t/t5801-remote-helpers.sh | 8 t/t5801/git-remote-testgit | 11 --- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/t/t5801-remote

[RFC/PATCH 0/5] Fix fetch regression with transport helpers

y sure the solution is the one we want, but hopefull it gives an idea as to what is needed. Felipe Contreras (5): t5801 (remote-helpers): cleanup refspec stuff t5801 (remote-helpers): add test to fetch tags fetch: trivial cleanup fetch: make the code more understandable fetch: fix regre

[PATCH] Fix comma splices

>From b18bd6babc2d6a6f79177acfa2416bb5bf2b153f Mon Sep 17 00:00:00 2001 From: Felipe Gasper Date: Sun, 21 Jan 2018 23:01:47 -0500 Subject: [PATCH] Fix comma splices in remote.c Signed-off-by: Felipe Gasper --- remote.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) d

[PATCH 06/11] completion: zsh: trivial cleanups

We don't need to override IFS, zsh has a native way of splitting by new lines: the expansion flag (f). Also, we don't need to split files by ':' or '='; that's only for words. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh

[PATCH 04/11] completion: zsh: don't hide ourselves

There's no need to hide the fact that we are on zsh any more. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh

[PATCH 09/11] completion: zsh: fix for directories with spaces

Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 1f786cc..28eaaed 100644 --- a/contrib/completion/git-completion.zsh

[PATCH 05/11] completion: remove zsh hack

We don't want to override the 'complete()' function in zsh, which can be used by bashcomp. Reported-by: Mark Lodato Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 1 + contrib/completion/git-completion.zsh | 6 -- 2 files changed, 1 insertion(

[PATCH 03/11] completion: bash: remove zsh wrapper

It has been deprecated for more than three years. It's time to move on. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 64 -- 1 file changed, 64 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/compl

[PATCH 11/11] Revert "Update documentation occurrences of filename .sh"

The original code was correct: the example location ~/.git-completion.sh is correct, because it's not only used by Bash. And zstyle command in Zsh should use that same location; the Bash script. This reverts commit 0e5ed7cca3c51c821c2bb0465617e75d994f432f. Signed-off-by: Felipe Cont

[PATCH 10/11] completion: prompt: fix for Zsh

We can add colour in Zsh without the need of pcmode. Signed-off-by: Felipe Contreras --- contrib/completion/git-prompt.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 64219e6..0da14ee 100644

[PATCH 07/11] completion: bash: cleanup cygwin check

Avoid Yoda conditions, use test, and cleaner statement. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 6c338ae

[PATCH 08/11] completion: zsh: improve main function selection

Sometimes we want to use the function directly (e.g. _git_checkout), for example when zsh has the option 'complete_aliases', this way, we can do something like: compdef _git gco=git_checkout Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 4 +++- 1 file

[PATCH 01/11] completion: add missing fetch options

Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e3918c8..ecdf742 100644 --- a/contrib/completion/git-completion.bash +++ b

[PATCH 00/11] Completion fixes and improvements

Hi, Here's a bunch of patches I've been using for a long time. I don't recall if I've sent some of these before. Here they are in case anybody is interested. Cheers. Felipe Contreras (11): completion: add missing fetch options completion: bash: remove old wrapper

[PATCH 02/11] completion: bash: remove old wrappers

Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 12 1 file changed, 12 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ecdf742..5e2e590 100644 --- a/contrib/completion/git-completion.bash

Re: [PATCH] fast-import: do not truncate exported marks file

On Tue, May 17, 2016 at 10:59 PM, Junio C Hamano wrote: > On Tue, May 17, 2016 at 8:31 PM, Felipe Contreras > wrote: >> On Tue, May 17, 2016 at 5:22 PM, Junio C Hamano wrote: >>> - Even if we did not read from any existing marks file, if we are >>>given e

Re: [PATCH] fast-import: do not truncate exported marks file

On Tue, May 17, 2016 at 5:22 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> Certain lines of the marks file might be corrupted (or the objects >> missing due to a garbage collection), but that's no reason to truncate >> the file and essentially destroy th

[PATCH] fast-import: do not truncate exported marks file

h. Signed-off-by: Felipe Contreras --- fast-import.c | 7 +-- t/t9300-fast-import.sh | 15 +++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/fast-import.c b/fast-import.c index 9fc7093..a975c34 100644 --- a/fast-import.c +++ b/fast-import.c @@ -32

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

s/enable/enabled/ Also, there is only one space between the second and third sentences. Just in case you haven't already fixed that. Regards, Felipe -- 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 v3 0/3] Tests for merge-recursive rename-options

On 23 February 2016 at 22:41, Felipe Gonçalves Assis 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 that the description of c443d39 sti

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

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

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

From: Felipe Gonçalves Assis Signed-off-by: Felipe Gonçalves Assis --- 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

[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 ..

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

From: Felipe Gonçalves Assis 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 option --rename-threshold. Also

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

On 23 February 2016 at 21:50, Eric Sunshine wrote: > On Tue, Feb 23, 2016 at 6:48 PM, Felipe Gonçalves Assis > wrote: >> 10ae752 (merge-recursive: option to specify rename threshold, >> 2010-09-27) introduced this feature but did not include any tests. >> >> The t

[PATCH 3/3] t3034: test deprecated interface

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

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

From: Felipe Gonçalves Assis 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 option --rename-threshold. Also

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

From: Felipe Gonçalves Assis Signed-off-by: Felipe Gonçalves Assis --- 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

[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 --- t/t3034-merge-recursive-rename-options.sh | 46 +++ 1 file changed, 46 insertions(+) diff --git a/t/t3034-merge-recursive-rename-options.sh b/t/t3034-merge

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

Signed-off-by: Felipe Gonçalves Assis --- 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 66fee8a..03ce77c 100755 --- a/t/t3034

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

for consistency: "merge-recursive options" -> "merge-recursive space options" Signed-off-by: Felipe Gonçalves Assis --- ...s.sh => t3032-merge-recursive-space-options.sh} | 2 +- t/t3034-merge-recursive-rename-options.sh | 235 + 2 fil

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

Based on c443d39 (merge-recursive: find-renames resets threshold, 2016-02-21). This patch involves only the tests for the features introduced in fa/merge-recursive-no-rename, for better review. The tests were rewritten so that the similarity indices are parsed instead of assumed. Felipe

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)

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 >&g

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

Signed-off-by: Felipe Gonçalves Assis --- 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/Documentation/merge-strategies.txt

[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 --- Now this already introduces the final names and descriptions for the tests. The test for threshold truncation was kept for now. Please confirm whethe

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

Signed-off-by: Felipe Gonçalves Assis --- 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 7ae7f83..a459236 100755 --- a/t/t3034

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

;, 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 --- Now includes tests with invalid arguments to --rename-threshold= t/t3034-merge-recursive-rename-options.sh | 42 +++ 1 file changed, 42 insertions(+) diff --git a

[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 wrote: > On Sun, Feb 21, 2016 at 10:09 AM, Felipe Gonçalves Assis > wrote: >> merge-recursive: test more consistent interface > > The real meat of this patch (it seems) is that you're adding tests to > verify that --find-renam

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

On 21 February 2016 at 14:52, Eric Sunshine wrote: > On Sun, Feb 21, 2016 at 10:09 AM, Felipe Gonçalves Assis > wrote: >> merge-recursive: test rename threshold option > >> + git read-tree --reset -u HEAD && >> + test_must_fail git m

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

Signed-off-by: Felipe Gonçalves Assis --- 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/Documentation/merge-strategies.txt

[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 --- merge-recur

[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 --- t/t3034-merge-recursive-rename-options.sh | 48

[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 --- ...on

[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 --- t/t3034-merge-recursive-rename-threshold.sh | 146 1 file changed, 146 insertions(+) create

[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, sorry. I did not noti

[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 --- This commit is independent of the proposed feature, so it might be of interest even if the rest of the patch is rejected. t

[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 --- Added tests. For consistent naming, I renamed and slightly edited the test of whitespace options: t/t3032-merge

[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 --- Added tests and made --find-renames reset the similarity index to the default. Documentation/merge-strategies.txt| 10

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

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 wrote: > On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis > wrote: >> No more renames option. rename-threshold enables renames. > > Can you add some tests? Off the top of my head, I'd expect to see at > least three new

[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 --- Documentation/merge-strategies.txt | 6 ++ merge-recursive.c | 7 +++ merge-recursive.h

[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 --- Documentation/merge-strategies.txt | 10 ++ merge-recursive.c | 5 - 2 files changed, 10 insertions(+), 5

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

On 16 February 2016 at 23:41, Eric Sunshine wrote: > On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis > wrote: >> The recursive strategy turns on rename detection by default. Add a >> strategy option to disable rename detection even for exact renames. >> >> S

[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 --- Documentation/merge-strategies.txt | 6 ++ merge-recursive.c | 7 +++ merge-recursive.h

[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 wit

[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 --- Following Hamano's review, this patch includes a strategy option "renames" and simplifies the implem

  1   2   3   4   5   6   7   8   9   10   >