From: ori@eigenstate.org
To: 9front@9front.org
Cc: igor@9lab.org, ori@eigenstate.org
Subject: Re: [9front] [PATCH] git/merge: fix merge if directory of merged file does not exist
Date: Tue, 19 Apr 2022 09:51:30 -0400 [thread overview]
Message-ID: <395F6014FC64E259F1D1574BDA898664@eigenstate.org> (raw)
In-Reply-To: <16252894EB4E4869BAF9B5658115F8FF@9lab.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.
> -
> + if(! test -d `{basename -d $tmp})
> + mkdir -p `{basename -d $tmp}
> if(! test -f $ours)
next prev parent reply other threads:[~2022-04-19 13:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 11:27 igor
2022-04-19 13:51 ` ori [this message]
2022-04-19 13:58 ` igor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=395F6014FC64E259F1D1574BDA898664@eigenstate.org \
--to=ori@eigenstate.org \
--cc=9front@9front.org \
--cc=igor@9lab.org \
--subject='Re: [9front] [PATCH] git/merge: fix merge if directory of merged file does not exist' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).