From 21075859e4f3ed93ef2a8ae072cc23d575b4549c Mon Sep 17 00:00:00 2001
From: Ori Bernstein <ori@eigenstate.org>
Date: Mon, 21 Jun 2021 02:12:58 +0000
Subject: git/revert: handle absolute paths gracefully (thanks deuteron)

when reverting files, absolute paths would get concatenated with
$gitrel; use `cleanname -d` to fix this.
---
 sys/src/cmd/git/revert | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sys/src')

diff --git a/sys/src/cmd/git/revert b/sys/src/cmd/git/revert
index a96fcac1d..a516e3a9d 100644
--- a/sys/src/cmd/git/revert
+++ b/sys/src/cmd/git/revert
@@ -11,9 +11,10 @@ commit=$gitfs/HEAD
 if(~ $#query 1)
 	commit=`{git/query -p $query}
 
-for(f in `$nl{cd $commit/tree/ && walk -f ./$gitrel/$*}){
+files=`$nl{cleanname -d $gitrel $*}
+for(f in `$nl{cd $commit/tree/ && walk -f $files}){
 	mkdir -p `{basename -d $f}
-	cp -- $commit/tree/$f $f
+	cp -x -- $commit/tree/$f $f
 	git/add $f
 }
 exit ''
-- 
cgit v1.2.3