From ce30e785b1c7b836c6fc387314e34503fc10a91c Mon Sep 17 00:00:00 2001
From: Ori Bernstein <ori@eigenstate.org>
Date: Sun, 6 Jun 2021 11:57:31 -0400
Subject: git/branch: diff clean and dirty lists correctly

no spaces in our lists.
---
 sys/src/cmd/git/branch | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'sys/src')

diff --git a/sys/src/cmd/git/branch b/sys/src/cmd/git/branch
index d132eb1e1..addfec4b6 100755
--- a/sys/src/cmd/git/branch
+++ b/sys/src/cmd/git/branch
@@ -66,13 +66,17 @@ if(! ~ $#stay 0){
 }
 basedir=`{git/query -p $base}
 dirtypaths=()
-cleanpaths=($modified $deleted)
 if(! ~ $#modified 0 || ! ~ $#deleted 0)
 	dirtypaths=`$nl{git/walk -cfRMA $modified $deleted}
-if(! ~ $#dirtypaths 0){
-	x=$nl^$cleanpaths
-	y=$nl^$dirtypaths
-	cleanpaths=`$nl{echo $"x$nl$"y | sort | uniq -u}
+if(! ~ $#modified 0 || ! ~ $#deleted 0)
+	dirtypaths=`$nl{git/walk -cfRMA $modified $deleted}
+if(~ $#dirtypaths 0)
+	cleanpaths=($modified $deleted)
+if not {
+	cleanpaths=()
+	for(p in $modified $deleted)
+		if(! ~ $p $dirtypaths)
+			cleanpaths=($cleanpaths $p)
 }
 
 echo $commit > .git/$new
-- 
cgit v1.2.3