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

git/common.rc: create required directories

Browse source 
we forgot a couple of directories when branching.
This commit is contained in:
Ori Bernstein 2022-04-19 14:34:48 +00:00
parent 929b0ff087
commit 3d047ddf03
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/lib/git/common.rc
View file

@ -73,6 +73,7 @@ fn merge1 {@{
base=/dev/null base=/dev/null
if(! test -f $theirs) if(! test -f $theirs)
theirs=/dev/null theirs=/dev/null
mkdir -p `{basename -d $tmp}
if(! ape/diff3 -3 -m $ours $base $theirs > $tmp) if(! ape/diff3 -3 -m $ours $base $theirs > $tmp)
echo merge needed: $out >[1=2] echo merge needed: $out >[1=2]
@ -94,9 +95,9 @@ fn gitup{
gitrel=`{pwd | drop $gitroot | sed 's@^/@@'} gitrel=`{pwd | drop $gitroot | sed 's@^/@@'}
if(~ $#gitrel 0) if(~ $#gitrel 0)
gitrel='.' gitrel='.'
cd $gitroot if(! cd $gitroot)
die cd $gitroot: no repo there
startfs=() startfs=()
if(! test -d $gitfs)
mkdir -p $gitfs mkdir -p $gitfs
if(! test -e $gitfs/ctl) if(! test -e $gitfs/ctl)
startfs=true startfs=true