xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Ori Bernstein 2021-06-28 18:28:08 +00:00
parent 658757abed
commit 682aabf9f6
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sys/src/cmd/git/branch
View file

@ -100,8 +100,10 @@ for(m in $cleanpaths){
rm -rf .git/index9/tracked/$m rm -rf .git/index9/tracked/$m
} }
if(~ $b file){ if(~ $b file){
cp -x $basedir/tree/$m $m if(cp -x -- $basedir/tree/$m $m)
walk -eq $m > .git/index9/tracked/$m walk -eq $m > .git/index9/tracked/$m
if not
echo -n > .git/index9/tracked/$m
} }
} }

6
sys/src/cmd/git/revert
View file

@ -14,7 +14,9 @@ if(~ $#query 1)
files=`$nl{cleanname -d $gitrel $*} files=`$nl{cleanname -d $gitrel $*}
for(f in `$nl{cd $commit/tree/ && walk -f $files}){ for(f in `$nl{cd $commit/tree/ && walk -f $files}){
mkdir -p `{basename -d $f} mkdir -p `{basename -d $f}
cp -x -- $commit/tree/$f $f if(cp -x -- $commit/tree/$f $f)
git/add $f walk -eq $m > .git/index9/tracked/$m
if not
echo -n > .git/index9/tracked/$m
} }
exit '' exit ''