bash: git-branch -d and -m lists only local branches

szeder · gitster · commit b9217642ef2d · 2008-03-05T12:10:29.000-08:00
But still all branches are listed, if -r is present

Signed-off-by: SZEDER Gábor &lt;szeder@ira.uka.de&gt;
Acked-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
 }
 
