From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Kirill Likhodedov <kirill.likhodedov@jetbrains.com>, git@vger.kernel.org
Subject: Re: [Bug] git pull doesn't recognize --work-tree parameter
Date: Thu, 13 Oct 2011 15:44:32 -0400 [thread overview]
Message-ID: <20111013194432.GA20082@sigill.intra.peff.net> (raw)
In-Reply-To: <20111013191457.GA18460@sigill.intra.peff.net>
On Thu, Oct 13, 2011 at 03:14:57PM -0400, Jeff King wrote:
> On Thu, Oct 13, 2011 at 12:06:46PM -0700, Junio C Hamano wrote:
>
> > It is not as simple as that I am afraid. We could introduce cd_to_top with
> > the new semantics and use it in pull and rebase, but a case that would
> > break is for a script (let's call that hypothetical operation "git svn
> > dcommit", even though I do not know if dcommit uses the real working tree
> > or a temporary one) that prepares a temporary working tree inside .git/svn/
> > and run "git rebase" there without setting GIT_WORKING_TREE to point at
> > the temporary directory.
>
> I didn't think that could happen now, because you would not be in the
> working tree, and therefore require_work_tree would fail. E.g., with
> current git I get:
>
> $ mkdir .git/tmp
> $ cd .git/tmp
> $ git rebase
> fatal: fatal: /home/peff/local/git/private/libexec/git-core/git-rebase
> cannot be used without a working tree.
>
> So that case is already broken. The only change this would make is that
> what used to fail would not actually take them to the top-level of the
> working tree[1].
Ugh. It does work if you do:
mkdir .git/tmp
cd .git/tmp
GIT_DIR=$PWD/.. git rebase
What a god-awful mess our initialization rules are.
-Peff
next prev parent reply other threads:[~2011-10-13 19:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-13 8:38 [Bug] git pull doesn't recognize --work-tree parameter Kirill Likhodedov
2011-10-13 10:55 ` Nguyen Thai Ngoc Duy
2011-10-13 15:59 ` Jeff King
2011-10-13 18:01 ` Junio C Hamano
2011-10-13 18:37 ` Jeff King
2011-10-13 19:06 ` Junio C Hamano
2011-10-13 19:14 ` Jeff King
2011-10-13 19:44 ` Jeff King [this message]
2011-10-18 6:34 ` Junio C Hamano
2011-10-13 20:48 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111013194432.GA20082@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kirill.likhodedov@jetbrains.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.
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 NNTP newsgroup(s).