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

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

[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

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

[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

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

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

[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

[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

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] 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: 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

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

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

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

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

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

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 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 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: Our official home page and logo for the Git project

situations. I propose you use the logo I chose for git-fc[1] which has a better color, and instead of showing commits going down, they go up. Here[2] you can see how horrible contrast this brigth red makes. [1] http://felipec.files.wordpress.com/2013/10/git-fc2.png [2] http://felipec.org/contrast

RE: [ANNOUNCE] WinGit - native x86/x64 Git for Windows

h needed. It would be great if there was a place to list all the tools that need to be converted to C, so that neither Perl, nor a shell are needed for most of Git's operations, don't you think? Cheers. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubs

Re: fast-import deltas

I say you should hack Git and do as many changes as you want, and once you have some numbers, it would be clearer what approach should be the ideal one, how much is the benefit, and then we could discuss if it's worth the modifications in Git needed. -- Felipe Contreras -- To unsubscribe f

[PATCH 0/5] Fixes

Felipe Contreras (4): remote-helpers: allow all tests running from any dir remote-hg: always normalize paths remote-bzr: add support for older versions completion: fix completion of certain aliases dequis (1): remote-bzr: include authors field in pushed commits contrib/completion/git

[PATCH 2/5] remote-hg: always normalize paths

Apparently Mercurial can have paths such as 'foo//bar', so normalize all paths. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg ind

[PATCH 1/5] remote-helpers: allow all tests running from any dir

Commit d3243d7 (test-bzr.sh, test-hg.sh: allow running from any dir) allowed the tests to run from any directory, however, it didn't update all the tests. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg-bidi.sh | 3 ++- contrib/remote-helpers/test-hg-hg-git.sh | 3 +

[PATCH 3/5] remote-bzr: add support for older versions

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 332aba7..7f354c8 100755 --- a/contrib/remote-helpers/git-remote

[PATCH 5/5] completion: fix completion of certain aliases

oesn't know where it come from. So let's override words[1], so the alias 'p' is override by the actual command, 'push'. Reported-by: Aymeric Beaumet Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 1 + contrib/completion/git-completion.

[PATCH 4/5] remote-bzr: include authors field in pushed commits

From: dequis Tests-by: Felipe Contreras Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 2 ++ contrib/remote-helpers/test-bzr.sh| 24 2 files changed, 26 insertions(+) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib

Re: [PATCH 5/5] completion: fix completion of certain aliases

Junio C Hamano wrote: > Felipe Contreras writes: > > > Some commands need the first word to determine the actual action that is > > being executed, however, the command is wrong when we use an alias, for > > example 'alias.p=push', if we try to complete '

RE: [PATCH] Add support for commit attributes

in YALM format) to show several information into > our CI server front-end. These attributes can be used for remote-helpers as well; to store extra information that cannot be stored otherwise in Git's data structures. -- Felipe Contreras -- To unsubscribe from this list: send the line "

[PATCH v2 0/9] Introduce publish tracking branch

[master, gh/fc/branch/fast] branch: reorganize verbose options fc/trivial f289b9a [master: ahead 7] branch: trivial style fix fc/leaksd101af4 [master: ahead 2] read-cache: plug a possible leak stable e230c56 Git 1.8.4 Changes since v1: * Added @{publish} and @{p} mar

[PATCH v2 1/9] push: trivial reorganization

Signed-off-by: Felipe Contreras --- builtin/push.c | 35 +++ 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 0e50ddb..d10aefc 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -155,20 +155,11 @@ static

[PATCH v2 3/9] branch: allow configuring the publish branch

Signed-off-by: Felipe Contreras --- Documentation/git-branch.txt | 11 + branch.c | 43 + branch.h | 2 ++ builtin/branch.c | 57 4 files changed, 108

[PATCH v2 2/9] Add concept of 'publish' branch

The upstream branch is: branch.$name.remote branch.$name.merge The publish branch is: branch.$name.pushremote branch.$name.push Signed-off-by: Felipe Contreras --- builtin/push.c | 19 +++ remote.c | 34 -- remote.h | 4

[PATCH v2 4/9] t: branch add publish branch tests

Signed-off-by: Felipe Contreras --- t/t3200-branch.sh | 76 +++ 1 file changed, 76 insertions(+) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index fcdb867..8cd21d1 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -907,4 +907,80

[PATCH v2 6/9] branch: display publish branch

Signed-off-by: Felipe Contreras --- builtin/branch.c | 17 - t/t6040-tracking-info.sh | 5 +++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 17773d7..e0a8d0a 100644 --- a/builtin/branch.c +++ b/builtin

[PATCH v2 7/9] sha1_name: cleanup interpret_branch_name()

The 'upstream' variable doesn't hold an "upstream", but a branch, so make it clearer. Signed-off-by: Felipe Contreras --- sha1_name.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 6fca

[PATCH v2 8/9] sha1_name: simplify track finding

It's more efficient to check for the braces first. Signed-off-by: Felipe Contreras --- sha1_name.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 906f09d..aa3f3e0 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -417,7 +

[PATCH v2 5/9] push: add --set-publish option

To setup publish tracking branch, like 'git branch --set-publish'. Signed-off-by: Felipe Contreras --- Documentation/git-push.txt | 9 +- builtin/push.c | 2 ++ t/t5529-push-publish.sh| 70 ++ transport.c

[PATCH v2 9/9] sha1_name: add support for @{publish} marks

Signed-off-by: Felipe Contreras --- Documentation/revisions.txt | 4 sha1_name.c | 49 - t/t1508-at-combinations.sh | 5 + 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/Documentation/revisions.txt b

Re: [PATCH 2/2] format-patch: introduce format.defaultTo

se my prompt is compromised: when I have a branch.*.remote > different from branch.*.pushremote, I'd like to see where my branch is with > respect to @{u} and @{publish} (not yet invented); @{publish} not yet invented? I sent this back in October: http://article.gmane.org/gmane.comp.

Re: [PATCH 2/2] format-patch: introduce format.defaultTo

http://article.gmane.org/gmane.comp.version-control.git/246038 -- 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 9/9] sha1_name: add support for @{publish} marks

Ramkumar Ramachandra wrote: > Felipe Contreras wrote: > > @@ -1068,23 +1069,35 @@ static const char *get_upstream_branch(const char > > *name_buf, int len) > > */ > > if (!branch) > > die(_("HEAD does not point to a bra

Re: [PATCH v2 8/9] sha1_name: simplify track finding

Ramkumar Ramachandra wrote: > Felipe Contreras wrote: > > It's more efficient to check for the braces first. > > Why is it more efficient? So you can error out quickly in the case of > a malformed string? That's one reason. The other is that get_sha1_basic() c

Re: [PATCH v2 9/9] sha1_name: add support for @{publish} marks

Ramkumar Ramachandra wrote: > Felipe Contreras wrote: > > diff --git a/sha1_name.c b/sha1_name.c > > index aa3f3e0..a36852d 100644 > > --- a/sha1_name.c > > +++ b/sha1_name.c > > @@ -415,9 +415,9 @@ static int ambiguous_path(const char *path,

Re: [PATCH v2 6/9] branch: display publish branch

Ramkumar Ramachandra wrote: > Felipe Contreras wrote: > > Signed-off-by: Felipe Contreras > > Please write a commit message, preferably showing the new git-branch output. Yeah... this has been sitting in git-fc for quite a while, I wasn't expecting to send this patch ser

Re: Our official home page and logo for the Git project

ou actually analized the logo? Or are you just arguing against change, because the logo is already used by git-scm.com, and related stuff? [1] http://felipec.org/contrast.png [2] http://git-osx-installer.googlecode.com/files/GitLogo.jpg -- 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: Our official home page and logo for the Git project

h. Also, there's more than the color to think about; look at the order of the pictured commits; they don't make any sense. -- 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 6/9] branch: display publish branch

Jeff King wrote: > On Thu, Apr 10, 2014 at 05:36:59PM -0500, Felipe Contreras wrote: > > > > I noticed that this only picks up a publish-branch if > > > branch.*.pushremote is configured. What happened to the case when > > > remote.pushdefault is configured?

Re: [PATCH v2 0/9] Introduce publish tracking branch

Matthieu Moy wrote: > Felipe Contreras writes: > > > As it has been discussed before, our support for triangular workflows is > > lacking, and the following patch series aims to improve that situation. > > I'm not a heavy user of triangular workflow, so I'm not

Re: Our official home page and logo for the Git project

Max Horn wrote: > On 11.04.2014, at 15:29, Felipe Contreras wrote: > > Max Horn wrote: > > > > You don't think red represent an oldness in Git? Whereas green > > represents progress? > > No, I don't think that. Then you belong to the minority of Git

Re: Our official home page and logo for the Git project

Vincent van Ravesteijn wrote: > On Fri, Apr 11, 2014 at 3:24 PM, Felipe Contreras > wrote: > > > > Moreover, even the black ones have the issue I already mentioned; they > > picture the equivalent of two root commits (with no parents) that are > > immediately mer

Re: Our official home page and logo for the Git project

company would have used a different > color. It doesn't. But green is still better. -- 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

[PATCH v3 2/8] Add concept of 'publish' branch

publish branch is: branch.$name.pushremote branch.$name.push Signed-off-by: Felipe Contreras --- Documentation/config.txt | 7 ++ builtin/push.c | 9 ++- remote.c | 34 +- remote.h | 4 t/t5516-fetch-push.sh

[PATCH v3 4/8] push: add --set-publish option

To setup publish tracking branch, like 'git branch --set-publish'. Signed-off-by: Felipe Contreras --- Documentation/git-push.txt | 9 +- builtin/push.c | 2 ++ t/t5534-push-publish.sh| 70 ++ transport.c

[PATCH v3 1/8] t5516 (fetch-push): fix test restoration

We shouldn't modify the commits; it screws the following tests. Signed-off-by: Felipe Contreras --- t/t5516-fetch-push.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 67e0ab3..f4cf0db 100755 --- a/t/t5516-fetch-push.sh +++ b/t/

[PATCH v3 0/8] Introduce publish tracking branch

t_config remote.down.url down_repo && + test_config remote.down.push refs/heads/master:refs/heads/bad && + test_config branch.master.pushremote down && + test_config branch.master.push for-john && + git push && + check_push_result

[PATCH v3 8/8] sha1_name: add support for @{publish} marks

Signed-off-by: Felipe Contreras --- Documentation/revisions.txt | 4 sha1_name.c | 49 - t/t1508-at-combinations.sh | 5 + 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/Documentation/revisions.txt b

[PATCH v3 7/8] sha1_name: simplify track finding

It's more efficient to check for the braces first. Signed-off-by: Felipe Contreras --- sha1_name.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 906f09d..aa3f3e0 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -417,7 +

[PATCH v3 3/8] branch: add --set-publish-to option

Signed-off-by: Felipe Contreras --- Documentation/git-branch.txt | 11 +++ branch.c | 44 + branch.h | 2 ++ builtin/branch.c | 57 ++--- t/t3200-branch.sh| 76

[PATCH v3 6/8] sha1_name: cleanup interpret_branch_name()

The 'upstream' variable doesn't hold an "upstream", but a branch, so make it clearer. Signed-off-by: Felipe Contreras --- sha1_name.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 6fca

[PATCH v3 5/8] branch: display publish branch

It does it along the upstream branch, if any. * publish ... [master, gh/publish: ahead 1] ... master ... [master, gh/master] ... Signed-off-by: Felipe Contreras --- builtin/branch.c | 17 - t/t6040-tracking-info.sh | 5 +++-- 2 files changed, 19 insertions(+), 3

Re: Our official home page and logo for the Git project

Max Horn wrote: > On 11.04.2014, at 17:21, Felipe Contreras wrote: > > Max Horn wrote: > >> On 11.04.2014, at 15:29, Felipe Contreras > >> wrote: > >>> Max Horn wrote: > >>> > >>> You don't think red represent an oldness in

Re: [PATCH v2 0/9] Introduce publish tracking branch

Matthieu Moy wrote: > Felipe Contreras writes: > > > My patch series only affects push.default=simple, perhaps you have a > > different configuration. > > Good catch. I have push.default=upstream (essentially for compatibility > with old Git versions, I'd prefe

Re: [PATCH v2 6/9] branch: display publish branch

es/foo/* [branch "master"] pushremote = foo push = refs/heads/bar > I personally think that kind of override adds any more values than > it causes confusion, so I think it is OK not to support such uses of > branch.*.push at all. A configu

  1   2   3   4   5   6   7   8   9   10   >