# [PATCH 0/5] Minor additions to git-completion.bash 10 messages from 2013-04-21 to 2013-04-29. Participants: Ramkumar Ramachandra, Felipe Contreras, Junio C Hamano. Thread: https://gitlist.dev/t/33561 ## Ramkumar Ramachandra, 2013-04-21 13:05 Subject: [PATCH 0/5] Minor additions to git-completion.bash Message-ID: <1366549551-18763-1-git-send-email-artagnon@gmail.com> URL: https://gitlist.dev/e/1366549551-18763-1-git-send-email-artagnon%40gmail.com ``` Hi, I just looked at the config section, and started writing patches, and kept going until I got bored. So they're pretty random. Sorry about the triviality of the patches: I was just looking to kill some time on a lazy Sunday afternoon. Thanks. Ramkumar Ramachandra (5): git-completion.bash: lexical sorting for diff.statGraphWidth git-completion.bash: add diff.submodule to config list git-completion.bash: complete branch.*.rebase as boolean git-completion.bash: add branch.*.pushremote to config list git-completion.bash: add remote.pushdefault to config list contrib/completion/git-completion.bash | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) -- 1.8.2.1.501.gd2949c7 ``` ## Ramkumar Ramachandra, 2013-04-21 13:05 Subject: [PATCH 1/5] git-completion.bash: lexical sorting for diff.statGraphWidth Message-ID: <1366549551-18763-2-git-send-email-artagnon@gmail.com> URL: https://gitlist.dev/e/1366549551-18763-2-git-send-email-artagnon%40gmail.com In-Reply-To: <1366549551-18763-1-git-send-email-artagnon@gmail.com> ``` df44483a (diff --stat: add config option to limit graph width, 2012-03-01) added the option diff.startGraphWidth to the list of configuration variables in git-completion.bash, but failed to notice that the list is sorted alphabetically. Move it to its rightful place in the list. Signed-off-by: Ramkumar Ramachandra --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 6df62c2..6bfb9ad 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2058,13 +2058,13 @@ _git_config () core.whitespace core.worktree diff.autorefreshindex - diff.statGraphWidth diff.external diff.ignoreSubmodules diff.mnemonicprefix diff.noprefix diff.renameLimit diff.renames + diff.statGraphWidth diff.suppressBlankEmpty diff.tool diff.wordRegex -- 1.8.2.1.501.gd2949c7 ``` ## Ramkumar Ramachandra, 2013-04-21 13:05 Subject: [PATCH 2/5] git-completion.bash: add diff.submodule to config list Message-ID: <1366549551-18763-3-git-send-email-artagnon@gmail.com> URL: https://gitlist.dev/e/1366549551-18763-3-git-send-email-artagnon%40gmail.com In-Reply-To: <1366549551-18763-1-git-send-email-artagnon@gmail.com> ``` c47ef57 (diff: introduce diff.submodule configuration variable, 2012-11-13) introduced the diff.submodule configuration variable, but forgot to teach git-completion.bash about it. Fix this. Signed-off-by: Ramkumar Ramachandra --- contrib/completion/git-completion.bash | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 6bfb9ad..f799dc8 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1864,6 +1864,10 @@ _git_config () " return ;; + diff.submodule) + __gitcomp "log short" + return + ;; help.format) __gitcomp "man info web html" return @@ -2065,6 +2069,7 @@ _git_config () diff.renameLimit diff.renames diff.statGraphWidth + diff.submodule diff.suppressBlankEmpty diff.tool diff.wordRegex -- 1.8.2.1.501.gd2949c7 ``` ## Ramkumar Ramachandra, 2013-04-21 13:05 Subject: [PATCH 3/5] git-completion.bash: complete branch.*.rebase as boolean Message-ID: <1366549551-18763-4-git-send-email-artagnon@gmail.com> URL: https://gitlist.dev/e/1366549551-18763-4-git-send-email-artagnon%40gmail.com In-Reply-To: <1366549551-18763-1-git-send-email-artagnon@gmail.com> ``` 6fac1b83 (completion: add missing config variables, 2009-06-29) added "rebase" to the list of completions for "branch.*.*", but forgot to specify completions for the values that this configuration variable can take (namely "false" and "true"). Fix this. Signed-off-by: Ramkumar Ramachandra --- contrib/completion/git-completion.bash | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f799dc8..843273c 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1825,6 +1825,10 @@ _git_config () __gitcomp_nl "$(__git_refs)" return ;; + branch.*.rebase) + __gitcomp "false true" + return + ;; remote.*.fetch) local remote="${prev#remote.}" remote="${remote%.fetch}" -- 1.8.2.1.501.gd2949c7 ``` ## Ramkumar Ramachandra, 2013-04-21 13:05 Subject: [PATCH 4/5] git-completion.bash: add branch.*.pushremote to config list Message-ID: <1366549551-18763-5-git-send-email-artagnon@gmail.com> URL: https://gitlist.dev/e/1366549551-18763-5-git-send-email-artagnon%40gmail.com In-Reply-To: <1366549551-18763-1-git-send-email-artagnon@gmail.com> ``` 9f765ce (remote.c: introduce branch..pushremote, 2013-04-02) introduced the configuration variable branch.*.pushremote, but forgot to teach git-completion.bash about it. Fix this. Signed-off-by: Ramkumar Ramachandra --- 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 843273c..fa0d604 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1817,7 +1817,7 @@ __git_config_get_set_variables () _git_config () { case "$prev" in - branch.*.remote) + branch.*.remote|branch.*.pushremote) __gitcomp_nl "$(__git_remotes)" return ;; @@ -1913,7 +1913,7 @@ _git_config () ;; branch.*.*) local pfx="${cur%.*}." cur_="${cur##*.}" - __gitcomp "remote merge mergeoptions rebase" "$pfx" "$cur_" + __gitcomp "remote pushremote merge mergeoptions rebase" "$pfx" "$cur_" return ;; branch.*) -- 1.8.2.1.501.gd2949c7 ``` ## Ramkumar Ramachandra, 2013-04-21 13:05 Subject: [PATCH 5/5] git-completion.bash: add remote.pushdefault to config list Message-ID: <1366549551-18763-6-git-send-email-artagnon@gmail.com> URL: https://gitlist.dev/e/1366549551-18763-6-git-send-email-artagnon%40gmail.com In-Reply-To: <1366549551-18763-1-git-send-email-artagnon@gmail.com> ``` 224c2171 (remote.c: introduce remote.pushdefault, 2013-04-02) introduced the remote.pushdefault configuration variable, but forgot to teach git-completion.bash about it. Fix this. Signed-off-by: Ramkumar Ramachandra --- contrib/completion/git-completion.bash | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index fa0d604..d0cb4f1 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1829,6 +1829,10 @@ _git_config () __gitcomp "false true" return ;; + remote.pushdefault) + __gitcomp_nl "$(__git_remotes)" + return + ;; remote.*.fetch) local remote="${prev#remote.}" remote="${remote%.fetch}" @@ -2208,6 +2212,7 @@ _git_config () receive.fsckObjects receive.unpackLimit receive.updateserverinfo + remote.pushdefault remotes. repack.usedeltabaseoffset rerere.autoupdate -- 1.8.2.1.501.gd2949c7 ``` ## Ramkumar Ramachandra, 2013-04-24 19:49 Subject: Re: [PATCH 0/5] Minor additions to git-completion.bash Message-ID: URL: https://gitlist.dev/e/CALkWK0mgfVNqOxaVY-JgKrzQe3rCJvaQuvp7frZKh7orRwdtig%40mail.gmail.com In-Reply-To: <1366549551-18763-1-git-send-email-artagnon@gmail.com> ``` Ramkumar Ramachandra wrote: > [...] Any updates on this? ``` ## Felipe Contreras, 2013-04-27 01:57 Subject: Re: [PATCH 0/5] Minor additions to git-completion.bash Message-ID: URL: https://gitlist.dev/e/CAMP44s1K9VYNbGFkec6mJ-xBZBafKvZqvu949DcVae12fuG9xA%40mail.gmail.com In-Reply-To: ``` On Wed, Apr 24, 2013 at 2:49 PM, Ramkumar Ramachandra wrote: > Ramkumar Ramachandra wrote: >> [...] > > Any updates on this? FWIW they all look OK to me. -- Felipe Contreras ``` ## Junio C Hamano, 2013-04-28 18:48 Subject: Re: [PATCH 0/5] Minor additions to git-completion.bash Message-ID: <7vvc76qyo4.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vvc76qyo4.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Felipe Contreras writes: > On Wed, Apr 24, 2013 at 2:49 PM, Ramkumar Ramachandra > wrote: >> Ramkumar Ramachandra wrote: >>> [...] >> >> Any updates on this? > > FWIW they all look OK to me. I do not have the original series, so a resend with Felipe's Acked-by after your original Sign-off would be nice. Thanks. ``` ## Felipe Contreras, 2013-04-29 04:58 Subject: Re: [PATCH 0/5] Minor additions to git-completion.bash Message-ID: URL: https://gitlist.dev/e/CAMP44s0Rp2mJ67f%2B%3Dsq_g78hNCQSiStkeBMtcfK%2BkS30S%3DcXVg%40mail.gmail.com In-Reply-To: <7vvc76qyo4.fsf@alter.siamese.dyndns.org> ``` On Sun, Apr 28, 2013 at 1:48 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> On Wed, Apr 24, 2013 at 2:49 PM, Ramkumar Ramachandra >> wrote: >>> Ramkumar Ramachandra wrote: >>>> [...] >>> >>> Any updates on this? >> >> FWIW they all look OK to me. > > I do not have the original series, so a resend with Felipe's Acked-by > after your original Sign-off would be nice. I only gave them a quick look. -- Felipe Contreras ```