From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Jacob Keller <jacob.keller@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Vitali Lovich <vlovich@gmail.com>
Subject: Re: [PATCH] sequencer: pass absolute GIT_WORK_TREE to exec commands
Date: Sat, 14 Jul 2018 17:55:55 +0000 [thread overview]
Message-ID: <20180714175555.GD1042117@genre.crustytoothpaste.net> (raw)
In-Reply-To: <20180714005702.GA20399@sigill.intra.peff.net>
[-- Attachment #1: Type: text/plain, Size: 1653 bytes --]
On Fri, Jul 13, 2018 at 08:57:03PM -0400, Jeff King wrote:
> On Sat, Jul 14, 2018 at 12:35:05AM +0000, brian m. carlson wrote:
>
> > diff --git a/sequencer.c b/sequencer.c
> > index 5354d4d51e..c8e16f9168 100644
> > --- a/sequencer.c
> > +++ b/sequencer.c
> > @@ -2636,6 +2636,8 @@ static int do_exec(const char *command_line)
> > fprintf(stderr, "Executing: %s\n", command_line);
> > child_argv[0] = command_line;
> > argv_array_pushf(&child_env, "GIT_DIR=%s", absolute_path(get_git_dir()));
> > + argv_array_pushf(&child_env, "GIT_WORK_TREE=%s",
> > + absolute_path(get_git_work_tree()));
> > status = run_command_v_opt_cd_env(child_argv, RUN_USING_SHELL, NULL,
> > child_env.argv);
> >
>
> As a general rule of "always pass GIT_WORK_TREE with GIT_DIR", you have
> to deal with the case where there _isn't_ a work tree. Are we OK here
> because this code is inside sequencer.c, and you cannot do a sequencer
> operation without a work tree?
I believe that's correct. We only call this code path from
sequencer_pick_commits or sequencer_continue, and those code paths are
only called from revert, commit, and rebase--helper; all of those
require a working tree.
> So I think it would also work to set:
>
> GIT_IMPLICIT_WORK_TREE=0
>
> here. But if the answer to my "are we OK" above is yes, I am fine with
> either that solution or the one you show here (but I think the commit
> message should probably mention it).
I'll reroll with a mention of that in the commit message. Thanks for a
careful review.
--
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 867 bytes --]
next prev parent reply other threads:[~2018-07-14 17:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-12 2:50 rev-parse --show-toplevel broken during exec'ed rebase? Vitali Lovich
2018-07-12 2:53 ` Vitali Lovich
2018-07-12 14:49 ` Johannes Schindelin
2018-07-12 15:02 ` Johannes Schindelin
2018-07-12 15:23 ` Junio C Hamano
2018-07-12 17:39 ` Vitali Lovich
2018-07-13 18:47 ` brian m. carlson
2018-07-13 20:19 ` Jeff King
2018-07-13 23:05 ` brian m. carlson
2018-07-14 0:35 ` [PATCH] sequencer: pass absolute GIT_WORK_TREE to exec commands brian m. carlson
2018-07-14 0:57 ` Jeff King
2018-07-14 17:55 ` brian m. carlson [this message]
2018-07-14 18:38 ` [PATCH v2] " brian m. carlson
2018-07-14 21:19 ` Jeff King
2018-07-14 21:05 ` [PATCH] " Johannes Schindelin
2018-07-14 21:09 ` brian m. carlson
2018-07-16 18:14 ` rev-parse --show-toplevel broken during exec'ed rebase? Junio C Hamano
2018-07-16 18:39 ` Jeff King
2018-07-16 21:10 ` Junio C Hamano
2018-07-19 20:28 ` Johannes Schindelin
2018-07-19 22:09 ` SZEDER Gábor
2018-07-19 22:34 ` Junio C Hamano
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=20180714175555.GD1042117@genre.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=peff@peff.net \
--cc=vlovich@gmail.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).