From mboxrd@z Thu Jan  1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham
	autolearn_force=no version=3.4.4
Received: (qmail 22190 invoked from network); 19 Apr 2022 13:53:35 -0000
Received: from 9front.inri.net (168.235.81.73)
  by inbox.vuxu.org with ESMTPUTF8; 19 Apr 2022 13:53:35 -0000
Received: from mimir.eigenstate.org ([206.124.132.107]) by 9front; Tue Apr 19 09:51:43 -0400 2022
Received: from abbatoir.myfiosgateway.com (pool-74-108-56-225.nycmny.fios.verizon.net [74.108.56.225])
	by mimir.eigenstate.org (OpenSMTPD) with ESMTPSA id 6544b35d (TLSv1.2:ECDHE-RSA-AES256-SHA:256:NO);
	Tue, 19 Apr 2022 06:51:31 -0700 (PDT)
Message-ID: <395F6014FC64E259F1D1574BDA898664@eigenstate.org>
To: 9front@9front.org
CC: igor@9lab.org, ori@eigenstate.org
Date: Tue, 19 Apr 2022 09:51:30 -0400
From: ori@eigenstate.org
In-Reply-To: <16252894EB4E4869BAF9B5658115F8FF@9lab.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: shader software just-in-time backend 
Subject: Re: [9front] [PATCH] git/merge: fix merge if directory of merged file does not exist
Reply-To: 9front@9front.org
Precedence: bulk

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.

> -
> +	if(! test -d `{basename -d $tmp})
> +		mkdir -p `{basename -d $tmp}
>  	if(! test -f $ours)