threads / patch / 47268

patchbash completion: Add --autostash and --no-autostash to pull

Subject: [PATCH] bash completion: Add --autostash and --no-autostash to pull

## tl;dr

2 messages between Nov 21, 2017 and Nov 24, 2017. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Albert Astals Cid· Nov 21, 2017, 14:39 UTC · lore

Ideally we should only autocomplete if pull has --rebase since they only work with it but could not figure out how to do that and the error message of doing git pull --autostash points out that you need --rebase so i guess it's good enough

Signed-off-by: Albert Astals Cid <albert.astals.cid@kdab.com>
---
 contrib/completion/git-completion.bash | 1 +
 1 file changed, 1 insertion(+)
Show changes to contrib/completion/git-completion.bash +1 −0
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-
completion.bash
index 539d7f84f..7ded58f38 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1923,6 +1923,7 @@ _git_pull ()
 	--*)
 		__gitcomp "
 			--rebase --no-rebase
+			--autostash --no-autostash
 			$__git_merge_options
 			$__git_fetch_options
 		"

-- 
2.15.0
SZEDER Gábor· Nov 24, 2017, 18:09 UTC · re: Albert Astals Cid · lore

Re: [PATCH] bash completion: Add --autostash and --no-autostash to pull

> Ideally we should only autocomplete if pull has --rebase since
> they only work with it but could not figure out how to do that
> and the error message of doing git pull --autostash points out
> that you need --rebase so i guess it's good enough

You could use the completion script's __git_find_on_cmdline() helper function to easily check whether the '--rebase' option is already present on the command line.

Having said that, I don't think we should go there, it feels that's trying to be overly and unnecessarily clever. After all, the order of command line options doesn't matter, and 'git pull --autostash --rebase' is a perfectly legit command.

Show 23 quoted lines
> Signed-off-by: Albert Astals Cid <albert.astals.cid@kdab.com>
> ---
>  contrib/completion/git-completion.bash | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-
> completion.bash
> index 539d7f84f..7ded58f38 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1923,6 +1923,7 @@ _git_pull ()
>  	--*)
>  		__gitcomp "
>  			--rebase --no-rebase
> +			--autostash --no-autostash
>  			$__git_merge_options
>  			$__git_fetch_options
>  		"
> -- 
> 2.15.0
> 
> 
>

← back to recent threads