Thread (6 messages) flat view 6 messages, 2 authors, 2016-06-15

Re: [BUG?] worktree setup broken in subdirs with git alias

From: Duy Nguyen <hidden>
Date: 2016-06-15 23:07:39

On Thu, Jan 7, 2016 at 2:15 PM, Michael J Gruber
[off-list ref] 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.
Current worktree: /home/mjg/Teaching/LUK
New worktree: /home/mjg/Teaching/LUK/Biomath-WS15

This is inside the subdir "Biomath-WS15" of the worktree residing in
".../LUK".

It wasn't like that last year ;)

Something about setting GIT_DIR and the like in the environment must
have changed (for aliases), badly interacting with the worktree code.

Michael
-- 
Duy
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help