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

git: handle absolute paths better

Browse source 
we were catting $gitrel onto absolute paths. stop it.
This commit is contained in:
Ori Bernstein 2021-06-05 13:40:28 +00:00
parent 4f3437a3cc
commit fd9679d97b
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sys/src/cmd/git/add
View file

@ -16,17 +16,18 @@ if(~ $remove 1){
if(~ $#* 0) if(~ $#* 0)
exec aux/usage exec aux/usage
paths=`$nl{cleanname -d $gitrel $*}
if(~ $add tracked) if(~ $add tracked)
files=`$nl{walk -f $gitrel/$*} files=`$nl{walk -f $paths}
if not if not
files=`$nl{cd .git/index9/tracked/ && walk -f $gitrel/$*} files=`$nl{cd .git/index9/tracked/ && walk -f $paths}
for(f in $files){ for(f in $files){
if(! ~ `{cleanname $f} .git/*){ if(! ~ `$nl{cleanname $f} .git/*){
addpath=.git/index9/$add/$f addpath=.git/index9/$add/$f
delpath=.git/index9/$del/$f delpath=.git/index9/$del/$f
mkdir -p `{basename -d $addpath} mkdir -p `$nl{basename -d $addpath}
mkdir -p `{basename -d $delpath} mkdir -p `$nl{basename -d $delpath}
# We don't want a matching qid, so that # We don't want a matching qid, so that
# git/walk doesn't think this came from # git/walk doesn't think this came from
# a checkout. # a checkout.

2
sys/src/cmd/git/commit
View file

@ -135,7 +135,7 @@ if not if(~ $#revise 1){
files=() files=()
if(! ~ $#* 0) if(! ~ $#* 0)
files=`$nl{git/walk -c `$nl{cleanname $gitrel/$*}} files=`$nl{git/walk -c `$nl{cleanname -d $gitrel $*}}
if(~ $status '' || ~ $#files 0 && ! test -f .git/index9/merge-parents && ~ $#revise 0) if(~ $status '' || ~ $#files 0 && ! test -f .git/index9/merge-parents && ~ $#revise 0)
die 'nothing to commit' $status die 'nothing to commit' $status
@{ @{

2
sys/src/cmd/git/diff
View file

@ -12,7 +12,7 @@ if(~ $#commit 0)
files=() files=()
if(! ~ $#* 0) if(! ~ $#* 0)
files=`{cleanname $gitrel/$*} files=`{cleanname -d $gitrel $*}
branch=`{git/query -p $commit} branch=`{git/query -p $commit}
if(~ $summarize 1){ if(~ $summarize 1){