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 bf2027cc73bacc976f340efa23b8c10667470f2c..6693d7c4ffb524f3988e1a2c7244844c28e3266c 100755 (executable)
--- 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 a516e3a9dbc36cd527085e89920b8d2afb7273fd..0f11d82a9144aa49990f105e660db2155e44e2d2 100644 (file)
--- 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 ''