From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Vitali Lovich <vlovich@gmail.com>,
git@vger.kernel.org, Jacob Keller <jacob.keller@gmail.com>
Subject: Re: rev-parse --show-toplevel broken during exec'ed rebase?
Date: Thu, 19 Jul 2018 22:28:03 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1807192225260.71@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqsh4jt5d0.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Mon, 16 Jul 2018, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > None of which is too surprising. The root of the bug is in the
> > conversion to rebase--helper, I think, when presumably we started
> > setting GIT_DIR at all (but I didn't dig further). Then 09d7b6c6fa fixed
> > _one_ fallout of that, which was relative paths, but didn't help the
> > subdirectory case.
> >
> > Just reading over this thread, I suspect the simplest fix is to pass
> > GIT_DIR and GIT_WORK_TREE together, which is almost always the right
> > thing to do.
>
> Perhaps. Not exporting GIT_DIR (unless the end-user already did to
> the environment before starting "git rebase"---it would be a bad
> change to unexport it unconditionally) may probably be a way to make
> rebase--helper conversion more faithful to the original scripted
> Porcelain, but I suspect in practice always giving GIT_DIR and
> GIT_WORK_TREE would work well for many existing hooks.
Forgetting the code in git-sh-setup, are we?
git_dir_init() rather specifically set GIT_DIR to the absolute path, and
since that variable is already exported, the `exec` commands launched via
`git-rebase--interactive` all saw it.
That is the reason why the sequencer.c was taught to set GIT_DIR to an
absolute path rathern than not setting it: for backwards compatibility.
Ciao,
Dscho
next prev parent reply other threads:[~2018-07-19 20:28 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
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 [this message]
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=nycvar.QRO.7.76.6.1807192225260.71@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.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).