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

2014-01-03 Thread Ramkumar Ramachandra
To ease development, prioritize ./git-completion.bash over other standard system paths. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh

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

2014-01-03 Thread Ramkumar Ramachandra
There are situations where two classes of completions possible. For example branch.TAB 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

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

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

2014-01-03 Thread Francesco Pretto
2014/1/3 Francesco Pretto cez...@gmail.com: 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

Rev: Collabration.

2014-01-03 Thread Ojong Kenchrist
Kenchrist Computer Research Center N22, Ikom Ogoja Rd Edor

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

2014-01-03 Thread Jeff King
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 sure

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

2014-01-03 Thread Kent R. Spillner
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

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

2014-01-03 Thread Ralf Thielow
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 ralf.thie...@gmail.com --- po/de.po | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index

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

2014-01-03 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com 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.autosetupmerTAB hit backspace to delete the trailing space,

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

2014-01-03 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com 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: aborted 'git fetch' leaves workspace unusable

2014-01-03 Thread Junio C Hamano
Stephen Leake stephen_le...@stephe-leake.org writes: Junio C Hamano gits...@pobox.com 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

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

2014-01-03 Thread Junio C Hamano
Jeff King p...@peff.net 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

[PATCH] submodule: Respect reqested branch on all clones

2014-01-03 Thread W. Trevor King
From: W. Trevor King wk...@tremily.us 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

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

2014-01-03 Thread Junio C Hamano
Tom Miller jacker...@gmail.com 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

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

2014-01-03 Thread Junio C Hamano
Vasily Makarov einmal...@gmail.com writes: pptr is needless. Some related code got cleaned as well Signed-off-by: Vasily Makarov einmal...@gmail.com --- commit.c | 33 +++-- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/commit.c b/commit.c

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

2014-01-03 Thread W. Trevor King
From: W. Trevor King wk...@tremily.us 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

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

2014-01-03 Thread Ramkumar Ramachandra
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 providing

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

2014-01-03 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com 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

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

2014-01-03 Thread Ramkumar Ramachandra
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

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

2014-01-03 Thread Ramkumar Ramachandra
To ease development, prioritize ./git-completion.bash over other standard system paths. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.zsh

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

2014-01-03 Thread Ramkumar Ramachandra
There are situations where multiple classes of completions possible. For example branch.TAB 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

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

2014-01-03 Thread Ramkumar Ramachandra
When attempting to complete $ git config remote.pushTAB '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

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

2014-01-03 Thread Ramkumar Ramachandra
When attempting to complete $ git config branch.autoTAB '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 ().

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

2014-01-03 Thread Thomas Rast
Ralf Thielow ralf.thie...@gmail.com 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

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

2014-01-03 Thread Thomas Rast
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 root_$1

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

2014-01-03 Thread Ted Zlatanov
On Wed, 01 May 2013 11:38:47 -0700 Junio C Hamano gits...@pobox.com wrote: JCH Felipe Contreras felipe.contre...@gmail.com writes: On Wed, May 1, 2013 at 11:39 AM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: So let's go ahead and apply these

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

2014-01-03 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com 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 @@

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

2014-01-03 Thread Matt Burke
I ran into the same (or similar) problem as reported in http://www.spinics.net/lists/git/msg173391.html. 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

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

2014-01-03 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: When attempting to complete $ git config remote.pushTAB '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 ().

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

2014-01-03 Thread brian m. carlson
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 artag...@gmail.com --- contrib/completion/git-completion.zsh | 2 +- 1 file changed, 1

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

2014-01-03 Thread Junio C Hamano
brian m. carlson sand...@crustytoothpaste.net 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 artag...@gmail.com ---