shithub: git9

Download patch

ref: d257e6478745710e03fa8699bc0b367bf7c0b8e8
parent: 87c0ea513b47a88f450912e63e689728f9213b5c
author: Ori Bernstein <ori@eigenstate.org>
date: Sun Jun 6 11:56:07 EDT 2021

git/branch: diff clean and dirty correctly

no spaces in our lists.

--- a/branch
+++ b/branch
@@ -66,13 +66,17 @@
 }
 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