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 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: Reset by checkout?

al > section waffling about indexes and go straight there instead. Or maybe we need to have sane options, like --stage, --work, and --keep. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org Mor

Re: [ANNOUNCE] Git v2.0.0

again. FTR. I haven't insulted anybody, I on the other hand have been insulted plenty of times, included by Junio. -- Felipe Contreras -- 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: Reset by checkout?

Felipe Contreras wrote: > Atsushi Nakagawa wrote: > > Ok, the typical use case is: I'm on 'master' and I make a few test > > commits. Afterwards, I want to discard the commits and move back to > > 'origin/master'. I could type 'reset --hard orig

RE: Reset by checkout?

irty files if I'm not careful. Or, I could use "reset by > checkout" and be carefree. Doesn't 'git reset orign/master' do that? -- Felipe Contreras -- 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: [ANNOUNCE] Git v2.0.0

Jeff King wrote: > On Wed, May 28, 2014 at 06:17:25PM -0500, Felipe Contreras wrote: > > > This is the last mail I sent to you, because you ignore them anyway, and > > remove them from the mailing list. > > [...] > > [2], a mail you conveniently removed from the tra

RE: [ANNOUNCE] Git v2.0.0

Felipe Contreras wrote: > In mail [3] you acknowledged my wish, and you said you were going to put > stubs for v2.0, and you didn't. You also conveniently removed this mail > from the archives. My bad. You actually did it. I missed it because the commit is named 'Revert "M

RE: [ANNOUNCE] Git v2.0.0

said I would, and bring as much public attention to what you are doing as possible. [1] 20140516084126.gb21...@sigill.intra.peff.net [2] 537bbd6c1daf_a6f166b308b0@nysa.notmuch [3] xmqqlhtwrufq@gitster.dls.corp.google.com For reference, here's the full content of mail [2]: From: Felipe Contr

Re: Summary of the problems with git pull

patches. I gave up on the Git project. -- Felipe Contreras -- 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: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

Felipe Contreras wrote: > Yes, I see how xx/topic~4 would be useful in the instruction sheet, I > just didn't see it would be useful to generate that from an existing > integration branch. After the explanation above I see how it could be > useful to some people (though not all

Re: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

next % git reintegrate --apply match-next https://github.com/felipec/git-reintegrate/commit/036395b -- Felipe Contreras -- 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: What's cooking in git.git (May 2014, #05; Fri, 23)

lpers: move tests out of contrib > + remote-helpers: move out of contrib > + remote-helpers: squelch python import exceptions > > No longer relevant, as 'master' unbundles contrib/remote-helpers/. Again a badly named branch; those changes are independent of the "graduation". -- Felipe Contreras -- 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: [ANNOUNCE] Git v2.0.0-rc4

Junio C Hamano wrote: > Felipe Contreras writes: > > > Junio C Hamano wrote: > > > >> * The remote-helper interface to fast-import/fast-export via the > >>transport-helper has been tightened to avoid leaving the import > >>marks file from a f

RE: [ANNOUNCE] Git v2.0.0-rc4

on of itself. Really? Where are the patches for that? I think it's fair to say the way the remote-helpers and transport-helper has been handled for v2.0 has been a total disaster. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the

Re: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

On Tue, May 20, 2014 at 5:47 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> I'm not sure what would be the usefulness of using things like >> 'xx/topic~4'. > > As a notation it is not very pretty ;-). > > Imagine that xx/topic is a

Re: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

Junio C Hamano wrote: > Felipe Contreras writes: > > > Or have an option to specify a dynamic instruction sheet, so you can cat > > the instructions of 'match-next' and replace the base. However, I don't > > see the point of re-applying the branches for &#

Re: [PATCH] remote-helpers: point at their upstream repositories

Johan Herland wrote: > On Tue, May 20, 2014 at 4:55 PM, Michael Haggerty > wrote: > > On 05/19/2014 11:31 PM, Junio C Hamano wrote: > >> Felipe Contreras writes: > >>> Where is git-imerge packaged? > >> > >> I didn't see it on the arc

Re: [PATCH] remote-helpers: point at their upstream repositories

Junio C Hamano wrote: > Felipe Contreras writes: > > >> Let's try this in a different way, as I sense there is a > >> misunderstanding somewhere about your "wish". > >> ... > > No, I already said I do not want the code removed from v2.0, tha

Re: [ANNOUNCE] git reintegrate v0.3; manager of integration branches

Junio C Hamano wrote: > Felipe Contreras writes: > > > ... > > Which will generate the integration instructions for you: > > > > % git reintegrate --cat > > base master > > merge jl/submodule-mv > > > > Moving a regular file in a re

Re: [PATCH] remote-helpers: point at their upstream repositories

Junio C Hamano wrote: > Felipe Contreras writes: > > > Junio C Hamano wrote: > >> > >> After looking at the reverse-depends list of packages, my faith is > >> strengthened in that the Git ecosystem is truly maturing and useful > >> third-part

Re: [PATCH] remote-helpers: point at their upstream repositories

Junio C Hamano wrote: > Felipe Contreras writes: > > > Junio C Hamano wrote: > > > >> 2. add warning that is given every time the scripts are run and > >> give the same instruction as in README. > >> > >> 3. (optional) cripple the s

Re: [PATCH] remote-helpers: point at their upstream repositories

Junio C Hamano wrote: > Junio C Hamano writes: > > > Felipe Contreras writes: > > > >> We could. Personally I don't see the point of making the warning any > >> more annoying > > If we were giving the users a choice of "no thanks, I&#x

Re: [ANNOUNCE] git related v0.3

Ævar Arnfjörð Bjarmason wrote: > On Mon, May 19, 2014 at 2:36 AM, Felipe Contreras > wrote: > > This tool finds people that might be interested in a patch, by going > > back through the history for each single hunk modified, and finding > > people that reviewed, acknowled

Re: [PATCH] remote-helpers: point at their upstream repositories

Junio C Hamano wrote: > Felipe Contreras writes: > > > Junio C Hamano wrote: > > > >> - The "always warn" does not force update at the point of use, but > >>it still does not help them to notice well before they try to use > >>

RE: bug: autostash is lost after aborted rebase

ling lists that do Reply-To munging, and Git is not one of them. Cheers. -- Felipe Contreras -- 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] remote-helpers: point at their upstream repositories

README. > > 3. (optional) cripple the script to make them always fail after > showing the same warning as above. This is what I want, and I already sent the patches for; the scripts will be stubs. At this point you would have effectively removed the code, which what I want. > 4

Re: [PATCH] remote-helpers: point at their upstream repositories

Junio C Hamano wrote: > Felipe Contreras writes: > > >> > But that being said, this is Felipe's code. While we have a legal right > >> > to distribute it in v2.0, if he would really prefer it out for v2.0, I > >> > would respect that. > >>

[ANNOUNCE] git send-series v0.1

anch. For example, if you want to see what was the status of your series of the branch 'feature-a' in version 2, you can use 'sent/feature-a/v2', for example to create an interdiff to see what changed between one version an the other. Enjoy. https://github.com/felipec/git-send-s

[ANNOUNCE] git related v0.3

Hamano (signer: 90%, author: 5%) Felipe Contreras (author: 25%, reviewer: 2%) Sverre Rabbelier (author: 17%, acker: 2%, signer: 7%) Jeff King (acker: 17%, author: 10%) Shawn O. Pearce (author: 5%, signer: 2%, cced: 2%) Elijah Newren (author: 10%) In addition, it has an

[ANNOUNCE] git reintegrate v0.3; manager of integration branches

onflicts, solve them and continue with `git reintegrate --continue`. Despite having more features, the code is actually smaller thanks to Ruby awesomeness. Enjoy. https://github.com/felipec/git-reintegrate Changes since v0.1: * Add support for empty commits * Add support for pause command * Upda

Re: [PATCH] remote-helpers: point at their upstream repositories

Matthieu Moy wrote: > Felipe Contreras writes: > > > % git fetch > > WARNING: git-remote-hg is now maintained independently. > > WARNING: For more information visit > > https://github.com/felipec/git-remote-hg > > searching for changes > > no chan

Re: [PATCH] remote-helpers: point at their upstream repositories

James Denholm wrote: > Felipe Contreras wrote: > > James Denholm wrote: > > > On Fri, May 16, 2014 at 05:39:42PM -0500, Felipe Contreras wrote: > > > > (...) I would venture to say you have never made a package in your > > > > life. > > >

Re: [PATCH] remote-helpers: point at their upstream repositories

Jeff King wrote: > On Sat, May 17, 2014 at 12:25:30AM -0500, Felipe Contreras wrote: > > > > I agree with the line of reasoning you laid out in your email, > > > especially: > > > > What a shock. > > Please stop with these unproductive and rude comment

Re: [PATCH] remote-helpers: point at their upstream repositories

id I would like it out at some point, not necessarily in v2.0. Junio said he was fine with that, but the proposals above don't do that. Now it seems you are changing your mind and you are OK with the code remaining in. Do what you will, but I already told you what I will do in response.

Re: [PATCH] remote-helpers: point at their upstream repositories

James Denholm wrote: > On Fri, May 16, 2014 at 05:39:42PM -0500, Felipe Contreras wrote: > > (...) I would venture to say you have never made a package in your > > life. > > And you have, Felipe? Let us see the years of experience you surely have > in the field. As a

Re: [PATCH] remote-helpers: point at their upstream repositories

t it's not as good as the patch I proposed where they are replaced with stubs (plus a README). > - warn every time the user runs the scripts. I suggested this, but only as a temporary measure. I am surprised that we are talking about the ways to proceed, and which ways would affect

RE: [PATCH 1/2] config: be strict on core.commentChar

(comment[0] && !comment[1]) > + comment_line_char = comment[0]; > + else > + return error("core.commentChar should only be > one character"); > + } Small nit: if (ret) return ret; if (comment

Re: [msysGit] [PATCH] transport-helper: add trailing --

s vs file names. Actually I tried to push a file named refs/heads/master and I saw the issue. I'd say it's a very rare issue, and I don't see how it could be triggered with normal files since all the ref names have the full name. That being said I don't think it would hurt. -

RE: [PATCH/RFC] Always auto-gc after calling a fast-import transport

triggered this? I'd say this patch is not doing anything in recent versions of Git. -- Felipe Contreras -- 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 01/17] contrib: remove outdated README

William Giokas wrote: > On Fri, May 16, 2014 at 05:21:36AM -0500, Felipe Contreras wrote: > > How exactly would it be better? > > > > If you concede that the Git release wouldn't be affected, then assuming > > a hypothetical future where git-remote-hg is bundled,

Re: [PATCH v2 01/17] contrib: remove outdated README

William Giokas wrote: > On Fri, May 16, 2014 at 03:08:51AM -0500, Felipe Contreras wrote: > > This is a red herring. Ignore the fact that it will never happen (which > > it won't), the next point remains a FACT, and you conveniently ignore > > it. > > It may not

Re: [PATCH] remote-helpers: point at their upstream repositories

, but the package still won't change. The distributions that do something special about remote-helpers (AFAIK it's only debian's git-bzr) would need to change, and sooner or later they will if there's only stubs there. Cheers. -- Felipe Contreras -- 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] remote-helpers: point at their upstream repositories

derstanding is that Felipe would prefer to keep it _in_ the git.git > repository and eventually get it included in the core. That is correct. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org M

Re: [PATCH v2 01/17] contrib: remove outdated README

Junio C Hamano wrote: > Felipe Contreras writes: > > == contrib vs. core == > > > > This is the only point relevant to contrib vs. core: > > > > > - We may be painted in a hard place if remote-hg or remote-bzr take > > >us to a position wh

RE: [PATCH] remote-helpers: point at their upstream repositories

ea's remote-helpers receive. I will consider that a deliberate attempt to make the new projects experience unnecessary hardship. -- Felipe Contreras -- 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/RFC] Always auto-gc after calling a fast-import transport

it gc --auto` is with a totally unpacked repository, but it guess it will be slow enough that some people might not want to do the gc initially. Not many people have complained about the size of the repoitory after cloning, so I think it should be OK to let users call `git gc` when they wish to. --

RE: [PATCH] transport-helper: add trailing --

e it? Adding an extra '--' would make sense if we do something like 'git fast-export $stuff master' and there was a file named master. However, we do 'git fast-export $stuff refs/heads/master', which case the '--' is a no-nop *always*. It doesn't hur

  1   2   3   4   5   6   7   8   9   10   >