threads / patch / 12687

patchbash: add 'git stash apply --index' option

Subject: [PATCH] bash: add 'git stash apply --index' option

## tl;dr

2 messages between Mar 14, 2008 and Mar 14, 2008. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

SZEDER Gábor· Mar 14, 2008, 11:15 UTC · lore

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 contrib/completion/git-completion.bash |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

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

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 5046f69..2265757 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1126,8 +1126,19 @@ _git_show ()
 _git_stash ()
 {
 	local subcommands='save list show apply clear drop pop create'
-	if [ -z "$(__git_find_subcommand "$subcommands")" ]; then
+	local subcommand="$(__git_find_subcommand "$subcommands")"
+	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
+	else
+		local cur="${COMP_WORDS[COMP_CWORD]}"
+		case "$subcommand,$cur" in
+		apply,--*)
+			__gitcomp "--index"
+			;;
+		*)
+			COMPREPLY=()
+			;;
+		esac
 	fi
 }

-- 
1.5.4.4.532.ga6828

SZEDER Gábor· Mar 14, 2008, 11:15 UTC · re: SZEDER Gábor · lore

[PATCH] bash: removed unnecessary checks for long options with argument

__gitcomp takes care of it since 5447aac7 (bash: fix long option with argument double completion, 2008-03-05)

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 contrib/completion/git-completion.bash |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

Show changes to contrib/completion/git-completion.bash +0 −2

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2265757..0bb78e7 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -539,7 +539,6 @@ _git_branch ()
 	done
 
 	case "${COMP_WORDS[COMP_CWORD]}" in
-	--*=*)	COMPREPLY=() ;;
 	--*)
 		__gitcomp "
 			--color --no-color --verbose --abbrev= --no-abbrev
@@ -1288,7 +1287,6 @@ _git ()
 
 	if [ -z "$command" ]; then
 		case "${COMP_WORDS[COMP_CWORD]}" in
-		--*=*) COMPREPLY=() ;;
 		--*)   __gitcomp "
 			--paginate
 			--no-pager

-- 
1.5.4.4.532.ga6828