Skip to contentSkip to conversation

cg-status: handle subdirs when listing heads

PATCH New Jonas Fonseca 1 participant 2 messages Jun 15, 2016

lore
Share & tools
lore

Jonas Fonseca

author
#0 lore raw

PATCH 1/1 cg-status: handle subdirs when listing heads

Signed-off-by Jonas Fonseca <[email protected]>

---

fonseca@antimatter:~/src/cogito/cogito > cg switch -r master tmp/work Creating new branch tmp/work: 218ee732bee381746890bf5ffb9bfc4672795954 Switching to branch tmp/work... fonseca@antimatter:~/src/cogito/cogito > cg status
Heads:

     cg-object-id        c10cc1d2a99b01ed3bf45d5f2ad6157940a22365
     cg-Xedit    41447107236a7d23daa6ab0f40a0829935485bc8
     master      218ee732bee381746890bf5ffb9bfc4672795954

R origin 218ee732bee381746890bf5ffb9bfc4672795954
cat: .git/refs/heads/tmp: Is a directory
tmp

commit 2e7be765ca86117dc7af8aa0cd0f090269fee428
tree 0154d7f35e6ae7c357ff18e7b1f46e2ee4d25309
parent 218ee732bee381746890bf5ffb9bfc4672795954
author Jonas Fonseca <[email protected]> Sun, 11 Dec 2005 19:57:31 +0100 committer Jonas Fonseca <[email protected]> Sun, 11 Dec 2005 19:57:31 +0100

 cg-status |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)
cg-status +19 -9
index a4c5e7a..629c796 100755
@@ -106,6 +106,24 @@ if [ ! "$gitstatus" ] && [ ! "$workstatu
 fi
 
 
+list_heads()
+{
+	local path="$1"
+
+	if [ -d "$path" ]; then
+		for head in "$path"/*; do
+			list_heads "$head"
+		done
+	else
+		headsha1=$(cat "$path")
+		headname=${path#$_git/refs/heads/}
+		[ "$headname" = "cg-seek-point" ] && continue
+		cf=" "; rf=" "
+		[ "$headname" = "$_git_head" ] && cf=">"
+		[ -s "$_git/branches/$headname" ] && rf="R"
+		echo -e "  $rf$cf$headname\t$headsha1"
+	fi
+}
 
 if [ "$gitstatus" ]; then
 	mkdir -p $_git/refs/heads

@@ -123,15 +141,7 @@ if [ "$gitstatus" ]; then
 	fi
 
 	echo "Heads:"
-	for head in $_git/refs/heads/*; do
-		headsha1=$(cat "$head")
-		headname=$(basename "$head")
-		[ "$headname" = "cg-seek-point" ] && continue
-		cf=" "; rf=" "
-		[ "$headname" = "$_git_head" ] && cf=">"
-		[ -s "$_git/branches/$headname" ] && rf="R"
-		echo -e "  $rf$cf$headname\t$headsha1"
-	done
+	list_heads "$_git/refs/heads"
 
 	if [ -s "$_git/merging" ]; then
 		tmp=$(cat "$_git/merging")

!-------------------------------------------------------------flip-

Signature · 1 line
Jonas Fonseca
author
#1 lore raw

PATCH 1/1 cg-status: handle subdirs when listing heads

Signed-off-by Jonas Fonseca <[email protected]>

---

And here's one which handles empty directories and is cleaner.

cg-status +2 -2
index a4c5e7a..bd4d0ce 100755
@@ -123,9 +123,9 @@ if [ "$gitstatus" ]; then
 	fi
 
 	echo "Heads:"
-	for head in $_git/refs/heads/*; do
+	find "$_git/refs/heads" ! -type d | sort | while read head; do 
 		headsha1=$(cat "$head")
-		headname=$(basename "$head")
+		headname=${head#$_git/refs/heads/}
 		[ "$headname" = "cg-seek-point" ] && continue
 		cf=" "; rf=" "
 		[ "$headname" = "$_git_head" ] && cf=">"
Signature · 1 line
Jonas Fonseca