summaryrefslogtreecommitdiff
path: root/sys/lib
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2022-04-19 14:34:48 +0000
committerOri Bernstein <ori@eigenstate.org>2022-04-19 14:34:48 +0000
commit3d047ddf03b9f977073427db7de98192ca0af351 (patch)
treef4a1ee6b934cb76648c14eb048b38d98e7f4c9bd /sys/lib
parent929b0ff087ff70c9deadb65fb1c54af91b814d9f (diff)
git/common.rc: create required directories
we forgot a couple of directories when branching.
Diffstat (limited to 'sys/lib')
-rw-r--r--sys/lib/git/common.rc7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/lib/git/common.rc b/sys/lib/git/common.rc
index 653d6bfb1..320439ab0 100644
--- a/sys/lib/git/common.rc
+++ b/sys/lib/git/common.rc
@@ -73,6 +73,7 @@ fn merge1 {@{
base=/dev/null
if(! test -f $theirs)
theirs=/dev/null
+ mkdir -p `{basename -d $tmp}
if(! ape/diff3 -3 -m $ours $base $theirs > $tmp)
echo merge needed: $out >[1=2]
@@ -94,10 +95,10 @@ fn gitup{
gitrel=`{pwd | drop $gitroot | sed 's@^/@@'}
if(~ $#gitrel 0)
gitrel='.'
- cd $gitroot
+ if(! cd $gitroot)
+ die cd $gitroot: no repo there
startfs=()
- if(! test -d $gitfs)
- mkdir -p $gitfs
+ mkdir -p $gitfs
if(! test -e $gitfs/ctl)
startfs=true
if(! grep -s '^repo '$gitroot'$' $gitfs/ctl >[2]/dev/null)