git/common.rc: create required directories
we forgot a couple of directories when branching.
This commit is contained in:
parent
4f3d5d083b
commit
fd3ab99fa9
1 changed files with 4 additions and 3 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue