Re: [PATCH v2 1/4] completion: prioritize ./git-completion.bash

"brian m. carlson" writes: > On Fri, Jan 03, 2014 at 01:30:28PM +0530, Ramkumar Ramachandra wrote: >> To ease development, prioritize ./git-completion.bash over other >> standard system paths. >> >> Signed-off-by: Ramkumar Ramachandra >> --- >> contrib/completion/git-completion.zsh | 2 +- >>

Re: [PATCH v2 1/4] completion: prioritize ./git-completion.bash

On Fri, Jan 03, 2014 at 01:30:28PM +0530, Ramkumar Ramachandra wrote: > To ease development, prioritize ./git-completion.bash over other > standard system paths. > > Signed-off-by: Ramkumar Ramachandra > --- > contrib/completion/git-completion.zsh | 2 +- > 1 file changed, 1 insertion(+), 1 dele

Re: [PATCH v3 4/4] completion: fix remote.pushdefault

Ramkumar Ramachandra writes: > When attempting to complete > > $ git config remote.push > > 'pushdefault' doesn't come up. This is because "$cur" is matched with > "remote.*" and a list of remotes are completed. Add 'pushdefault' to the > list of remotes using __gitcomp_nl_append (). "Add ...

Re: Bug report: stash in upstream caused remote fetch to fail

I ran into the same (or similar) problem as reported in . I have a script that, among other things, clones a git repository. Here's where it does that: + git init -q + git fetch -q -fu ../../../other '+refs/*:refs/*' fatal: bad object 9b985fbe6a2b78

Re: [PATCH v3 2/4] completion: introduce __gitcomp_nl_append ()

Ramkumar Ramachandra writes: > diff --git a/contrib/completion/git-completion.bash > b/contrib/completion/git-completion.bash > index 51c2dd4..bf358d6 100644 > --- a/contrib/completion/git-completion.bash > +++ b/contrib/completion/git-completion.bash > @@ -233,6 +233,19 @@ __gitcomp_nl () >

Re: [PATCH v2 00/18] remote-bzr: massive changes

On Wed, 01 May 2013 11:38:47 -0700 Junio C Hamano wrote: JCH> Felipe Contreras writes: >> On Wed, May 1, 2013 at 11:39 AM, Junio C Hamano wrote: >>> Felipe Contreras writes: >>> > So let's go ahead and apply these directly on top of 'master', once > we hear from Emacs folks and they

Re: [RFH/PATCH] graph: give an extra gap after showing root commit

Hi Junio, I briefly looked at d84a3da (jc/graph-post-root-gap) in pu, and have this nit: > diff --git a/t/t6016-rev-list-graph-simplify-history.sh > b/t/t6016-rev-list-graph-simplify-history.sh > [...] > +one_independent_branch () { > + git checkout --orphan root$1 A1 && > + test_commit

Re: [PATCH] l10n: de.po: fix translation of 'prefix'

Ralf Thielow writes: > The word 'prefix' is currently translated as 'Prefix' > which is not a German word. It should be translated as > 'Präfix'. Indeed :-) Thanks! -- Thomas Rast t...@thomasrast.ch -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

[PATCH v3 4/4] completion: fix remote.pushdefault

When attempting to complete $ git config remote.push 'pushdefault' doesn't come up. This is because "$cur" is matched with "remote.*" and a list of remotes are completed. Add 'pushdefault' to the list of remotes using __gitcomp_nl_append (). Signed-off-by: Ramkumar Ramachandra --- contrib/co

[PATCH v3 3/4] completion: fix branch.autosetup(merge|rebase)

When attempting to complete $ git config branch.auto 'autosetupmerge' and 'autosetuprebase' don't come up. This is because "$cur" is matched with "branch.*" and a list of branches are completed. Add 'autosetupmerge', 'autosetuprebase' to the list of branches using __gitcomp_nl_append (). Signe

[PATCH v3 2/4] completion: introduce __gitcomp_nl_append ()

There are situations where multiple classes of completions possible. For example branch. should try to complete branch.master. branch.autosetupmerge branch.autosetuprebase The first candidate has the suffix ".", and the second/ third candidates have the suffix " ". To facilitate complet

[PATCH v3 0/4] Fix branch.autosetup(merge|rebase) completion

Hi Junio et al, In v3, I've implemented __gitcomp_nl_append (), like you suggested. After implementing it, I feel foolish about having gone around my head to do __gitcomp_2 (). Thanks. Ramkumar Ramachandra (4): completion: prioritize ./git-completion.bash completion: introduce __gitcomp_nl_a

[PATCH v3 1/4] completion: prioritize ./git-completion.bash

To ease development, prioritize ./git-completion.bash over other standard system paths. Signed-off-by: Ramkumar Ramachandra --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/gi

Re: [PATCH 3/4] completion: fix branch.autosetup(merge|rebase)

Ramkumar Ramachandra writes: > Junio C Hamano wrote: >> You seem to be calling it "incorrect" to give the same degree of >> completion for a branch the user named "autosetupmerge" as another >> branch "topic", but I think it is incorrect not to, so I cannot tell >> if we are agreeing or disagreei

Re: [PATCH 2/4] completion: introduce __gitcomp_2 ()

Junio C Hamano wrote: > I am not sure what you are worried about $pfx; what does it do when > you have strings with different prefix in COMPREPLY? If it breaks, > then the answer is "don't do it then". > > Doesn't an array know its own length and give you a way to ask? Right. I was just throwing c

[PATCH] get_octopus_merge_bases(): cleanup redundant variable

pptr is needless. Some related code got cleaned as well Signed-off-by: Vasily Makarov --- commit.c | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/commit.c b/commit.c index de16a3c..8e48c49 100644 --- a/commit.c +++ b/commit.c @@ -834,26

Re: [PATCH 3/4] completion: fix branch.autosetup(merge|rebase)

Junio C Hamano wrote: > You seem to be calling it "incorrect" to give the same degree of > completion for a branch the user named "autosetupmerge" as another > branch "topic", but I think it is incorrect not to, so I cannot tell > if we are agreeing or disagreeing. No, what's incorrect is providin

[PATCH] Documentation/gitmodules: Only 'update' and 'url' are required

From: "W. Trevor King" Before this commit, all the settings fell under the initial "Each submodule section also contains the following required keys:". The example shows sections with just 'update' and 'url' entries, but we should still make the required/optional distinction explicit for the des

Re: [PATCH] get_octopus_merge_bases(): cleanup redundant variable

Vasily Makarov writes: > pptr is needless. Some related code got cleaned as well > > Signed-off-by: Vasily Makarov > --- > commit.c | 33 +++-- > 1 file changed, 15 insertions(+), 18 deletions(-) > > diff --git a/commit.c b/commit.c > index de16a3c..4a7a192 100644 >

Re: [PATCH V3 1/2] fetch --prune: Always print header url

Tom Miller writes: > If "fetch --prune" is run with no new refs to fetch, but it has refs > to prune. Then, the header url is not printed as it would if there were > new refs to fetch. > > Output before this patch: > > $ git fetch --prune remote-with-no-new-refs >x [deleted]

[PATCH] submodule: Respect reqested branch on all clones

From: "W. Trevor King" The previous code only checked out the requested branch in cmd_add. This commit moves the branch-checkout logic into module_clone, where it can be shared by cmd_add and cmd_update. I also update the initial checkout command to use 'rebase' to preserve branches setup during

Re: [PATCH v2 3/4] Speed up is_git_command() by checking early for internal commands

Jeff King writes: > On Thu, Jan 02, 2014 at 11:41:05AM -0800, Junio C Hamano wrote: > >> - builtin/merge.c is the same, but it is conceptually even worse. >>It has the end-user supplied string and wants to see if it is a >>valid strategy. If the user wants to use a custom strategy, a >>

Re: aborted 'git fetch' leaves workspace unusable

Stephen Leake writes: > Junio C Hamano writes: > >> stephen_le...@stephe-leake.org writes: >> >>> However, in this case, even running the fetch was a mistake; I would >>> have prefered that it leave FETCH_HEAD in its previous state. >> >> I think the clearing of leftover FETCH_HEAD is one of the

Re: [PATCH 2/4] completion: introduce __gitcomp_2 ()

Ramkumar Ramachandra writes: > Junio C Hamano wrote: >> __gitcomp_nl "$(__git_heads)" "$pfx" "$cur_" "." >> __gitcomp_nl_append $"autosetupmerge\nautosetuprebase\n" "$pfx" >> "$cur_" " " > > This is not a bad idea at all. I'm just afraid that we might be > leaving open ends: What

Re: [PATCH 3/4] completion: fix branch.autosetup(merge|rebase)

Ramkumar Ramachandra writes: > Junio C Hamano wrote: >> If we are looking at "branch.autosetupmerge." followed by something, >> who typed that final dot? > > I admit that it's a very unlikely case. The user did: > > $ branch.autosetupmer > > hit backspace to delete the trailing space, inserted

[PATCH] l10n: de.po: fix translation of 'prefix'

The word 'prefix' is currently translated as 'Prefix' which is not a German word. It should be translated as 'Präfix'. Signed-off-by: Ralf Thielow --- po/de.po | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index 5e2d709..c0bbb65 100644 -

Re: [PATCH v2 3/4] Speed up is_git_command() by checking early for internal commands

> Since 2dce956 is_git_command() is a bit slow as it does file I/O in the > call to list_commands_in_dir(). Avoid the file I/O by adding an early > check for internal commands. Considering the purpose of the series is it better to say "builtin" instead of "internal" in the commit message?-- To u

Re: [PATCH v2 3/4] Speed up is_git_command() by checking early for internal commands

On Thu, Jan 02, 2014 at 11:41:05AM -0800, Junio C Hamano wrote: > - builtin/merge.c is the same, but it is conceptually even worse. >It has the end-user supplied string and wants to see if it is a >valid strategy. If the user wants to use a custom strategy, a >single stat() to make s

[PATCH] get_octopus_merge_bases(): cleanup redundant variable

pptr is needless. Some related code got cleaned as well Signed-off-by: Vasily Makarov --- commit.c | 33 +++-- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/commit.c b/commit.c index de16a3c..4a7a192 100644 --- a/commit.c +++ b/commit.c @@ -834,26 +8

Rev: Collabration.

Kenchrist Computer Research Center N22, Ikom Ogoja Rd Edor

Re: [PATCH/RFC] Introduce git submodule add|update --attach

2014/1/3 Francesco Pretto : > Concluding, my point is that at the current state submodules in git > seem to be flawed because of the inconsistent HEAD state between "add" > and "update" users. With my patch applied the attached HEAD behavior > would be fully supported. At some point "git submodule

[PATCH v2 2/4] completion: introduce __gitcomp_2 ()

There are situations where two classes of completions possible. For example branch. should try to complete branch.master. branch.autosetupmerge branch.autosetuprebase The first candidate has the suffix ".", and the second/ third candidates have the suffix " ". To facilitate completions

[PATCH v2 0/4] Fix branch.autosetup(merge|rebase) completion

Hi, In this iteration, I've removed hunks to prevent completing: $ git config remote.pushdefault. $ git config branch.autosetupmerge. $ git config branch.autosetuprebase. Since they're perfectly valid remote/ branch names. Thanks. Ramkumar Ramachandra (4): completion: prioritize ./git-

[PATCH v2 1/4] completion: prioritize ./git-completion.bash

To ease development, prioritize ./git-completion.bash over other standard system paths. Signed-off-by: Ramkumar Ramachandra --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/gi

[PATCH v2 3/4] completion: fix branch.autosetup(merge|rebase)

When attempting to complete $ git config branch.auto 'autosetupmerge' and 'autosetuprebase' don't come up. This is because "$cur" is matched with "branch.*" and a list of branches are completed. Add 'autosetup(merge|rebase)' to the list of branches using __gitcomp_2 (). Signed-off-by: Ramkumar

[PATCH v2 4/4] completion: fix remote.pushdefault

When attempting to complete $ git config remote.push 'pushdefault' doesn't come up. This is because "$cur" is matched with "remote.*" and a list of remotes are completed. Add 'pushdefault' to the list of remotes using __gitcomp_2 (). Signed-off-by: Ramkumar Ramachandra --- contrib/completion