From: Matheus Tavares Bernardino <matheus.bernardino@usp.br>
To: Adam Dinwoodie <adam@dinwoodie.org>
Cc: Git Mailing List <git@vger.kernel.org>,
Achim Gratz <Stromeko@nexgo.de>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] apply: don't use core.sharedRepository to create working tree files
Date: Tue, 22 Dec 2020 19:49:26 -0300 [thread overview]
Message-ID: <CAHd-oW7XJL_a1zMAUetHzvrh8DrLT4g2awv-fjbTdeLVLKVsew@mail.gmail.com> (raw)
In-Reply-To: <CA+kUOamSd_3z8LbYt8QRx==HauYXoCe95B5hAW1W-LdnwGP-xw@mail.gmail.com>
On Tue, Dec 22, 2020 at 7:24 PM Adam Dinwoodie <adam@dinwoodie.org> wrote:
>
> Cracked it, and it's a simple error in the test script. It wasn't
> readily obvious because the error gets silently swallowed, and
> presumably because the command isn't necessary on most *nix systems
> that have different behaviour for inheriting permissions, but the
> entire problem is fixed with the following diff:
>
> --- a/t/t4129-apply-samemode.sh
> +++ b/t/t4129-apply-samemode.sh
> @@ -78,7 +78,7 @@
> test_config core.sharedRepository 0666 &&
> (
> # Remove a default ACL if possible.
> - (setfacl -k newdir 2>/dev/null || true) &&
> + (setfacl -k . 2>/dev/null || true) &&
> umask 0077 &&
>
> # Test both files (f1) and leading dirs (d)
>
> It looks like the erroneous line was copied from t0001-init.sh, but
> that's a test where "newdir" is actually an existent directory, where
> we never use a directory of that name in this test script.
My bad, I should have been more careful here. Thanks for finding the problem!
> I'm assuming this is a simple and obvious enough fix that it can just
> get squashed into the original commit, but I don't know if that breaks
> things given the original commit is now included in rc tags. Let me
> know if I need to format and submit this as a full patch?
Yeah, since the original patch is already merged into `master`, I
think a new patch fixing the problem would be more appropriate.
Thanks,
Matheus
next prev parent reply other threads:[~2020-12-22 22:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 15:23 Is git-am expected to honor core.sharedRepository? Matheus Tavares Bernardino
2020-12-01 17:58 ` Junio C Hamano
2020-12-01 23:45 ` [PATCH] apply: don't use core.sharedRepository to create working tree files Matheus Tavares
2020-12-02 0:21 ` Junio C Hamano
2020-12-19 17:51 ` Adam Dinwoodie
2020-12-19 18:12 ` Junio C Hamano
2020-12-19 18:59 ` Adam Dinwoodie
2020-12-19 18:32 ` Achim Gratz
2020-12-19 19:57 ` Adam Dinwoodie
2020-12-19 21:01 ` Achim Gratz
2020-12-22 22:24 ` Adam Dinwoodie
2020-12-22 22:49 ` Matheus Tavares Bernardino [this message]
2020-12-23 11:44 ` [PATCH] t4129: fix setfacl-related permissions failure Adam Dinwoodie
2021-01-09 15:06 ` Matheus Tavares Bernardino
2021-01-09 22:43 ` Junio C Hamano
2020-12-02 22:06 ` Is git-am expected to honor core.sharedRepository? Junio C Hamano
2020-12-03 1:44 ` Matheus Tavares Bernardino
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAHd-oW7XJL_a1zMAUetHzvrh8DrLT4g2awv-fjbTdeLVLKVsew@mail.gmail.com \
--to=matheus.bernardino@usp.br \
--cc=Stromeko@nexgo.de \
--cc=adam@dinwoodie.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).