threads / patch / 12501

patch, 2 partsbash: add git-branch options

Subject: [PATCH 1/2] bash: add git-branch options

## tl;dr

3 messages between Mar 4, 2008 and Mar 5, 2008. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

SZEDER Gábor· Mar 4, 2008, 18:00 UTC · lore

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

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

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8f70e1e..8d6733a 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -506,7 +506,16 @@ _git_bisect ()
 
 _git_branch ()
 {
-	__gitcomp "$(__git_refs)"
+	case "${COMP_WORDS[COMP_CWORD]}" in
+	--*=*)	COMPREPLY=() ;;
+	--*)
+		__gitcomp "
+			--color --no-color --verbose --abbrev= --no-abbrev
+			--track --no-track
+			"
+		;;
+	*)	__gitcomp "$(__git_refs)" ;;
+	esac
 }
 
 _git_bundle ()

-- 
1.5.4.3

SZEDER Gábor· Mar 4, 2008, 18:00 UTC · re: SZEDER Gábor · lore

[PATCH 2/2] bash: git-branch -d and -m lists only local branches

But still all branches are listed, if -r is present

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

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

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8d6733a..49e6df0 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -506,6 +506,17 @@ _git_bisect ()
 
 _git_branch ()
 {
+	local i c=1 only_local_ref="n" has_r="n"
+
+	while [ $c -lt $COMP_CWORD ]; do
+		i="${COMP_WORDS[c]}"
+		case "$i" in
+		-d|-m)	only_local_ref="y" ;;
+		-r)	has_r="y" ;;
+		esac
+		c=$((++c))
+	done
+
 	case "${COMP_WORDS[COMP_CWORD]}" in
 	--*=*)	COMPREPLY=() ;;
 	--*)
@@ -514,7 +525,13 @@ _git_branch ()
 			--track --no-track
 			"
 		;;
-	*)	__gitcomp "$(__git_refs)" ;;
+	*)
+		if [ $only_local_ref = "y" -a $has_r = "n" ]; then
+			__gitcomp "$(__git_heads)"
+		else
+			__gitcomp "$(__git_refs)"
+		fi
+		;;
 	esac
 }

-- 
1.5.4.3

Shawn O. Pearce· Mar 5, 2008, 05:51 UTC · re: SZEDER Gábor · lore

Re: [PATCH 2/2] bash: git-branch -d and -m lists only local branches

SZEDER Gbor <szeder@ira.uka.de> wrote:

> But still all branches are listed, if -r is present
> 
> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>

Nice.

Both patches 1 and 2,
Acked-by: Shawn O. Pearce <spearce@spearce.org>

> ---
>  contrib/completion/git-completion.bash |   19 ++++++++++++++++++-
>  1 files changed, 18 insertions(+), 1 deletions(-)

-- 
Shawn.