From e6452991705314a97c30e9d2647a02098c64bfac Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 6 Jun 2018 11:32:53 +1000
Subject: [PATCH] fetch_trees: skip comments and branch control lines just
 using awk

---
 fetch_trees | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fetch_trees b/fetch_trees
index b15e35b..87e1b6c 100755
--- a/fetch_trees
+++ b/fetch_trees
@@ -5,7 +5,7 @@
 [ "$1" = "-n" ] && {
 	shift
 	last=$(tail -n1 $SHA1_FILE | cut -f1 -d$'\t')
-	start_from=$(awk -F '\t' '$3 == "'$last'" { do getline; while (/^#/ || $2 == "branch"); print $3; exit 0; }' $CTRL_FILE)
+	start_from=$(awk -F '\t' '/^[^#]/ && $3 == "'$last'" { do getline; while (/^#/ || $2 == "branch"); print $3; exit 0; }' $CTRL_FILE)
 }
 
 [ "$1" = "-s" ] && {
@@ -20,8 +20,7 @@
 
 get_field()
 {
-	grep -v '^#' $CTRL_FILE |
-		awk -F '\t' '$3 == "'$1'" { print $'$2'; }'
+	awk -F '\t' '/^[^#]/ && $3 == "'$1'" { print $'$2'; }' $CTRL_FILE
 }
 
 fetch_git()
@@ -97,7 +96,7 @@ fetch_quilt()
 
 trees="$@"
 [ "$trees" ] ||
-	trees=$(grep -v '^#' $CTRL_FILE | awk -F '\t' '{ print $3 }')
+	trees=$(awk -F '\t' '/^[^#]/ && $2 != "branch" { print $3 }' $CTRL_FILE)
 
 for name in $trees; do
 	[ -n "$start_from" ] && {
-- 
2.39.2