From: Ori Bernstein <ori@eigenstate.org>
Date: Mon, 28 Jun 2021 18:28:08 +0000 (+0000)
Subject: git/branch: mark files we couldn't update as dirty
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=682aabf9f692f310ad910910073d8f9d3839b716;p=plan9front.git

git/branch: mark files we couldn't update as dirty
---

diff --git a/sys/src/cmd/git/branch b/sys/src/cmd/git/branch
index bf2027cc7..6693d7c4f 100755
--- a/sys/src/cmd/git/branch
+++ b/sys/src/cmd/git/branch
@@ -100,8 +100,10 @@ for(m in $cleanpaths){
 		rm -rf .git/index9/tracked/$m
 	}
 	if(~ $b file){
-		cp -x $basedir/tree/$m $m
-		walk -eq $m > .git/index9/tracked/$m
+		if(cp -x -- $basedir/tree/$m $m)
+			walk -eq $m > .git/index9/tracked/$m
+		if not
+			echo -n > .git/index9/tracked/$m
 	}
 }
 
diff --git a/sys/src/cmd/git/revert b/sys/src/cmd/git/revert
index a516e3a9d..0f11d82a9 100644
--- a/sys/src/cmd/git/revert
+++ b/sys/src/cmd/git/revert
@@ -14,7 +14,9 @@ if(~ $#query 1)
 files=`$nl{cleanname -d $gitrel $*}
 for(f in `$nl{cd $commit/tree/ && walk -f $files}){
 	mkdir -p `{basename -d $f}
-	cp -x -- $commit/tree/$f $f
-	git/add $f
+	if(cp -x -- $commit/tree/$f $f)
+		walk -eq $m > .git/index9/tracked/$m
+	if not
+		echo -n > .git/index9/tracked/$m
 }
 exit ''