threads / patch / 45796

patchAdd --indent-heuristic to bash completion.

Subject: [PATCH] Add --indent-heuristic to bash completion.

## tl;dr

5 messages between Apr 25, 2017 and Apr 27, 2017. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Martin Liška· Apr 25, 2017, 11:37 UTC · lore

Hello.

The patch adds BASH completion for a newly added option.

Thanks, Martin

From 316355276a9772cdfdd24a81f19400f176944df2 Mon Sep 17 00:00:00 2001
From: marxin <mliska@suse.cz>
Date: Tue, 25 Apr 2017 13:35:17 +0200
Subject: [PATCH] Add --indent-heuristic to bash completion.

Signed-off-by: Martin Liska <mliska@suse.cz>
---
 contrib/completion/git-completion.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Show changes to contrib/completion/git-completion.bash +3 −1

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1150164d5..8fb25594c 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1395,7 +1395,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--quiet --ext-diff --no-ext-diff
 			--no-prefix --src-prefix= --dst-prefix=
 			--inter-hunk-context=
-			--patience --histogram --minimal
+			--patience --histogram --indent-heuristic --minimal
 			--raw --word-diff --word-diff-regex=
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
@@ -1482,6 +1482,7 @@ __git_format_patch_options="
 	--not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
 	--inline --suffix= --ignore-if-in-upstream --subject-prefix=
 	--output-directory --reroll-count --to= --quiet --notes
+	--indent-heuristic
 "
 
 _git_format_patch ()
@@ -1681,6 +1682,7 @@ __git_log_common_options="
 	--min-age= --until= --before=
 	--min-parents= --max-parents=
 	--no-min-parents --no-max-parents
+	--indent-heuristic
 "
 # Options that go well for log and gitk (not shortlog)
 __git_log_gitk_options="

-- 
2.12.2

Stefan Beller· Apr 26, 2017, 19:38 UTC · re: Martin Liška · lore

Re: [PATCH] Add --indent-heuristic to bash completion.

On Tue, Apr 25, 2017 at 4:37 AM, Martin Liška <mliska@suse.cz> wrote:

> Hello.
>
> The patch adds BASH completion for a newly added option.
>

The looks good, though the format is unusual. (We prefer the format to be inline instead of an attachment)

Thanks, Stefan

Martin Liška· Apr 27, 2017, 09:09 UTC · re: Stefan Beller · lore

Re: [PATCH] Add --indent-heuristic to bash completion.

On 04/26/2017 09:38 PM, Stefan Beller wrote:

Show 8 quoted lines

> On Tue, Apr 25, 2017 at 4:37 AM, Martin Liška <mliska@suse.cz> wrote:
>> Hello.
>>
>> The patch adds BASH completion for a newly added option.
>>
> 
> The looks good, though the format is unusual. (We prefer the
> format to be inline instead of an attachment)

Good, adding inline version. I've read Documentation/SubmittingPatches, can you please help me which maintainer should I CC?

Martin
---
 contrib/completion/git-completion.bash | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Show changes to contrib/completion/git-completion.bash +3 −1

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1150164d5..8fb25594c 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1395,7 +1395,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--quiet --ext-diff --no-ext-diff
 			--no-prefix --src-prefix= --dst-prefix=
 			--inter-hunk-context=
-			--patience --histogram --minimal
+			--patience --histogram --indent-heuristic --minimal
 			--raw --word-diff --word-diff-regex=
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
@@ -1482,6 +1482,7 @@ __git_format_patch_options="
 	--not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
 	--inline --suffix= --ignore-if-in-upstream --subject-prefix=
 	--output-directory --reroll-count --to= --quiet --notes
+	--indent-heuristic
 "
 
 _git_format_patch ()
@@ -1681,6 +1682,7 @@ __git_log_common_options="
 	--min-age= --until= --before=
 	--min-parents= --max-parents=
 	--no-min-parents --no-max-parents
+	--indent-heuristic
 "
 # Options that go well for log and gitk (not shortlog)
 __git_log_gitk_options="

-- 
2.12.2

Stefan Beller· Apr 27, 2017, 16:37 UTC · re: Martin Liška · lore

Re: [PATCH] Add --indent-heuristic to bash completion.

On Thu, Apr 27, 2017 at 2:09 AM, Martin Liška <mliska@suse.cz> wrote:

Show 13 quoted lines

> On 04/26/2017 09:38 PM, Stefan Beller wrote:
>> On Tue, Apr 25, 2017 at 4:37 AM, Martin Liška <mliska@suse.cz> wrote:
>>> Hello.
>>>
>>> The patch adds BASH completion for a newly added option.
>>>
>>
>> The looks good, though the format is unusual. (We prefer the
>> format to be inline instead of an attachment)
>
> Good, adding inline version.
> I've read Documentation/SubmittingPatches, can you please help me which
> maintainer should I CC?

cc'd Junio (the only maintainer in Git, are you a kernel developer, where you have hundreds of maintainers?)

Thanks, Stefan

Show 37 quoted lines

>
> Martin
> ---
>  contrib/completion/git-completion.bash | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 1150164d5..8fb25594c 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1395,7 +1395,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
>                         --quiet --ext-diff --no-ext-diff
>                         --no-prefix --src-prefix= --dst-prefix=
>                         --inter-hunk-context=
> -                       --patience --histogram --minimal
> +                       --patience --histogram --indent-heuristic --minimal
>                         --raw --word-diff --word-diff-regex=
>                         --dirstat --dirstat= --dirstat-by-file
>                         --dirstat-by-file= --cumulative
> @@ -1482,6 +1482,7 @@ __git_format_patch_options="
>         --not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
>         --inline --suffix= --ignore-if-in-upstream --subject-prefix=
>         --output-directory --reroll-count --to= --quiet --notes
> +       --indent-heuristic
>  "
>
>  _git_format_patch ()
> @@ -1681,6 +1682,7 @@ __git_log_common_options="
>         --min-age= --until= --before=
>         --min-parents= --max-parents=
>         --no-min-parents --no-max-parents
> +       --indent-heuristic
>  "
>  # Options that go well for log and gitk (not shortlog)
>  __git_log_gitk_options="
> --
> 2.12.2

SZEDER Gábor· Apr 27, 2017, 20:48 UTC · re: Martin Liška · lore

Re: [PATCH] Add --indent-heuristic to bash completion.

> The patch adds BASH completion for a newly added option.

There is a '--no-indent-heuristic' option, too, and a 'diff.indentHeuristic' config variable as well.

I'm not sure it's worth it, though. As far as I remember the future plans for indent heuristics, this option and config variable are only temporary, and this heuristic will become the default after a few releases of testing anyway (assuming that nothing prohibitive pops up in the meantime).

Show 48 quoted lines

> --------------5BA49415AE751679784E55AA
> Content-Type: text/x-patch;
>  name="0001-Add-indent-heuristic-to-bash-completion.patch"
> Content-Transfer-Encoding: 7bit
> Content-Disposition: attachment;
>  filename="0001-Add-indent-heuristic-to-bash-completion.patch"
> 
> >From 316355276a9772cdfdd24a81f19400f176944df2 Mon Sep 17 00:00:00 2001
> From: marxin <mliska@suse.cz>
> Date: Tue, 25 Apr 2017 13:35:17 +0200
> Subject: [PATCH] Add --indent-heuristic to bash completion.
> 
> Signed-off-by: Martin Liska <mliska@suse.cz>
> ---
>  contrib/completion/git-completion.bash | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 1150164d5..8fb25594c 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1395,7 +1395,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
>  			--quiet --ext-diff --no-ext-diff
>  			--no-prefix --src-prefix= --dst-prefix=
>  			--inter-hunk-context=
> -			--patience --histogram --minimal
> +			--patience --histogram --indent-heuristic --minimal
>  			--raw --word-diff --word-diff-regex=
>  			--dirstat --dirstat= --dirstat-by-file
>  			--dirstat-by-file= --cumulative
> @@ -1482,6 +1482,7 @@ __git_format_patch_options="
>  	--not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
>  	--inline --suffix= --ignore-if-in-upstream --subject-prefix=
>  	--output-directory --reroll-count --to= --quiet --notes
> +	--indent-heuristic
>  "
>  
>  _git_format_patch ()
> @@ -1681,6 +1682,7 @@ __git_log_common_options="
>  	--min-age= --until= --before=
>  	--min-parents= --max-parents=
>  	--no-min-parents --no-max-parents
> +	--indent-heuristic
>  "
>  # Options that go well for log and gitk (not shortlog)
>  __git_log_gitk_options="
> -- 
> 2.12.2