Re: [9front] [PATCH] git/merge: fix merge if directory of merged file does not exist

[igor@9lab.org]

Quoth ori@eigenstate.org:
> Quoth igor@9lab.org:
> > When merging from branch `front` to `test` the following test case
> > fails:
> > 
> > <snip>
> >
> > A solution is to check if the folder exists and create it via `mkdir -p`
> > in case it doesn't.
> > 
> > Can someone have a look and confirm this is the right solution and not
> > a hack. If this is Ok plz let me know and I can push the fix.
> > 
> 
> I've got that added in my patch queue, slightly differently;
> because mkdir -p always succeeds, there's no need for the if.

Excellent, then I will wait for you to push that one ☺

There is one more instance of mkdir -p in gitup, you probably have that
one converted as well to remove the test (see highlighted part):

fn gitup{
	gitroot=`{git/conf -r >[2]/dev/null}
	if(~ $#gitroot 0)
		die 'not a git repository'
	gitfs=$gitroot/.git/fs
	gitrel=`{pwd | drop $gitroot | sed 's@^/@@'}
	if(~ $#gitrel 0)
		gitrel='.'
	cd $gitroot
	startfs=()
	if(! test -d $gitfs)
		mkdir -p $gitfs
^^^^^^^^^^^^^^^^^^^^^^^^^^
	if(! test -e $gitfs/ctl)
		startfs=true
	if(! grep -s '^repo '$gitroot'$' $gitfs/ctl >[2]/dev/null)
		startfs=true
	if(~ $#startfs 1)
		git/fs
	if not
		status=''
}