[PATCH] Show [xxxx] suffix after non-"heads" branches in git-branch output

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This patch changes from showing only those refs in "heads/" to all non-"tags/"
refs.

For any ref that isn't a "heads/" ref (like "remotes/") a suffix of "[xxx]" is
added to the line.
Signed-off-by: Andy Parkins <andyparkins@xxxxxxxxx>
---
This patch is in preference to my earlier "Use "up/" prefix for all the 
upstream branches" patch.  Junio pointed out that that patch wasn't necessary 
because git already supports the "--use-separate-remote" option.  This patch 
makes git-branch always show all the branches that are useable as references 
in tree-ish, but highlights the remote branches.

 git-branch.sh |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/git-branch.sh b/git-branch.sh
index f823c78..bddd189 100755
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -87,17 +87,28 @@ done
 
 case "$#" in
 0)
-	git-rev-parse --symbolic --branches |
+	git-rev-parse --symbolic --all |
 	sort |
-	while read ref
+	grep -v "^refs/tags" |
+	sed -ne 's|^refs/\([^/]*\)/\(.*\)|\1 \2|p' |
+	while read type ref
 	do
+		case "$type" in
+		heads)
+			type=""
+			;;
+		*)
+			type=" [$type]"
+			;;
+		esac
+
 		if test "$headref" = "$ref"
 		then
 			pfx='*'
 		else
 			pfx=' '
 		fi
-		echo "$pfx $ref"
+		echo "$pfx $ref$type"
 	done
 	exit 0 ;;
 1)
-- 
1.4.2.3

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]