From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
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 15:34:56 -0700 [thread overview]
Message-ID: <xmqqva9adfcf.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180719220929.6550-1-szeder.dev@gmail.com> ("SZEDER Gábor"'s message of "Fri, 20 Jul 2018 00:09:29 +0200")
SZEDER Gábor <szeder.dev@gmail.com> writes:
>> 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.
>
> GIT_DIR was not exported to 'exec' commands during an interactive
> rebase prior to 18633e1a22 (rebase -i: use the rebase--helper builtin,
> 2017-02-09) (nor was GIT_PREFIX):
>
> $ git log -Sgit_dir_init master git-rebase*.sh
> # Nothing.
> $ git checkout 18633e1a22a6^ && make -j4 prefix=/tmp/BEFORE install
> <....>
> $ git checkout 18633e1a22a6 && make -j4 prefix=/tmp/AFTER install
> <....>
> $ GIT_EDITOR='sed -i -e "1ix set |grep ^GIT"' /tmp/BEFORE/bin/git rebase -i HEAD^
> Executing: set |grep ^GIT
> GIT_CHERRY_PICK_HELP=$'\nWhen you have resolved this problem, run "git rebase --continue".\nIf you prefer to skip this patch, run "git rebase --skip" instead.\nTo check out the original branch and stop rebasing, run "git rebase --abort".\n'
> GIT_EDITOR='sed -i -e "1ix set |grep ^GIT"'
> GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
> GIT_REFLOG_ACTION='rebase -i (start): checkout HEAD^'
> warning: notes ref refs/notes/commits is invalid
> Successfully rebased and updated refs/heads/master.
> $ GIT_EDITOR='sed -i -e "1ix set |grep ^GIT"' /tmp/AFTER/bin/git rebase -i HEAD^
> Executing: set |grep ^GIT
> GIT_CHERRY_PICK_HELP='
> GIT_DIR='.git'
> GIT_EDITOR='sed -i -e "1ix set |grep ^GIT"'
> GIT_INTERNAL_GETTEXT_SH_SCHEME='gnu'
> GIT_PREFIX=''
> GIT_REFLOG_ACTION='rebase -i (start): checkout HEAD^'
> warning: notes ref refs/notes/commits is invalid
> Successfully rebased and updated refs/heads/master.
>
> And then recently came 226c0ddd0d (exec_cmd: RUNTIME_PREFIX on some
> POSIX systems, 2018-04-10), which then started to export GIT_EXEC_PATH
> to 'exec' commands as well...
Correct. git-sh-setup does assign to GIT_DIR, but unless the
end-user has it exported, it does not export, which has long been
very deliberate. But it does not really matter, as exporting BOTH
GIT_DIR and GIT_WORK_TREE is a lot easier to understand and probably
safe (even though technically a regressing) solution, and fewer and
fewer things will be relying on git-sh-setup in the future anyway.
prev parent reply other threads:[~2018-07-19 22:35 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
2018-07-19 22:09 ` SZEDER Gábor
2018-07-19 22:34 ` Junio C Hamano [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
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=xmqqva9adfcf.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=szeder.dev@gmail.com \
--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).