From: Michael J Gruber <git@drmicha•warpmail.net>
To: Duy Nguyen <pclouds@gmail•com>, Git Mailing List <git@vger•kernel.org>
Subject: Re: [BUG?] worktree setup broken in subdirs with git alias
Date: Thu, 7 Jan 2016 10:40:18 +0100 [thread overview]
Message-ID: <568E3282.1060508@drmicha.warpmail.net> (raw)
In-Reply-To: <CACsJy8CRJhdb9Gf+SkC+BSHuGa0DPEBZnCDRUa7zkJvrBK72kQ@mail.gmail.com>
Duy Nguyen venit, vidit, dixit 07.01.2016 10:26:
> On Thu, Jan 7, 2016 at 2:15 PM, Michael J Gruber
> <git@drmicha•warpmail.net> wrote:
>> Hi there,
>>
>> sorry I can't dig deeper now, but the worktree code from next seems to
>> get confused now as soon as you cd to a subdir of a worktree (other than
>> the main worktree) and use an alias:
>>
>> git help ss
>> `git ss' is aliased to `status -s -b'
>> [mjg@skimbleshanks Biomath-WS15 (exam $)]✓ git status -s -b
>> ## exam
>> [mjg@skimbleshanks Biomath-WS15 (exam $)]✓ git ss
>> fatal: internal error: work tree has already been set
>
> You forgot to mention what version you used. But it's probably related
> to d95138e (setup: set env $GIT_WORK_TREE when work tree is set, like
> $GIT_DIR - 2015-06-26). This commit fixed your problem (and was
> released) but it introduced some other regressions so it's been
> reverted in 'next'. 'pu' has a re-fix on top of the revert.
Well, I mentioned "from next", which I admit is not super-precise (it's
next not older than a day or two, plus some local additions). In fact it is:
ef7b32d (Sync with 2.7, 2016-01-04)
which "has" d95138e (as per git branch contains) but also df1e6ea87
which reverts it. (I guess --really-contains would be neat but difficult.)
So while I didn't notice the problems that lead to the revert, I noticed
the problems the revert created... Early adopters' luck.
As for the fix on pu, do you mean that one:
ac78663 (run-command: don't warn on SIGPIPE deaths, 2015-12-29)
I'll give it a shot then.
Michael
next prev parent reply other threads:[~2016-01-07 9:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-07 7:15 [BUG?] worktree setup broken in subdirs with git alias Michael J Gruber
2016-01-07 9:26 ` Duy Nguyen
2016-01-07 9:31 ` Duy Nguyen
2016-01-07 9:40 ` Michael J Gruber [this message]
2016-01-07 9:48 ` Duy Nguyen
2016-01-07 9:49 ` Michael J Gruber
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=568E3282.1060508@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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