From: Peter Korsgaard <peter@korsgaard.com>
To: Brandon Maier via buildroot <buildroot@buildroot.org>
Cc: Ricardo Martincoski <ricardo.martincoski@datacom.com.br>,
Brandon Maier <brandon.maier@collins.com>
Subject: Re: [Buildroot] [PATCH 1/1] utils/docker-run: fix support for git-worktrees
Date: Wed, 30 Aug 2023 23:59:17 +0200 [thread overview]
Message-ID: <87y1hsnqdm.fsf@48ers.dk> (raw)
In-Reply-To: <20230728213218.3893857-1-brandon.maier@collins.com> (Brandon Maier via buildroot's message of "Fri, 28 Jul 2023 21:32:18 +0000")
>>>>> "Brandon" == Brandon Maier via buildroot <buildroot@buildroot.org> writes:
> The docker-run script attempts to support git-new-workdirs and
> git-worktrees by resolving the symlink at '$GIT_DIR/config' to get the
> true $GIT_DIR. However this does not work for git-worktrees as they do
> not use symlinks, instead they change the $GIT_DIR into a regular file
> that contains the path to the real $GIT_DIR. To complicate things
> further, we actually want the $GIT_COMMON_DIR which is the superset of a
> worktree's $GIT_DIR.
> git-rev-parse supports the '--git-common-dir' which will resolve the
> $GIT_COMMON_DIR for us. However it does not work for git-new-workdirs,
> so we still need to detect and handle them.
> Signed-off-by: Brandon Maier <brandon.maier@collins.com>
Committed to 2023.02.x and 2023.05.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
prev parent reply other threads:[~2023-08-30 21:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 21:32 [Buildroot] [PATCH 1/1] utils/docker-run: fix support for git-worktrees Brandon Maier via buildroot
2023-07-29 15:33 ` Yann E. MORIN
2023-07-31 17:36 ` [Buildroot] [External] " Maier, Brandon L Collins via buildroot
2023-07-31 17:53 ` Maier, Brandon L Collins via buildroot
2023-07-31 18:50 ` Yann E. MORIN
2023-08-30 21:59 ` Peter Korsgaard [this message]
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=87y1hsnqdm.fsf@48ers.dk \
--to=peter@korsgaard.com \
--cc=brandon.maier@collins.com \
--cc=buildroot@buildroot.org \
--cc=ricardo.martincoski@datacom.com.br \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox