git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Regression in v2.13.3, fixed in master: aliases in worktrees
@ 2017-07-14 14:34 Johannes Schindelin
  2017-07-14 15:20 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Johannes Schindelin @ 2017-07-14 14:34 UTC (permalink / raw)
  To: git

Hi all,

just to let you know that repository-local aliases stopped working in
v2.13.3. This is due to my "aliases via early config" work that made it
into a maintenance release...

The bug is fixed in master already, and I cherry-picked Brandon's config-h
series that contains the fix into Git for Windows' master branch.

I only had to add one add-on patch that falls back to opts->git_dir when
opts->commondir is NULL (no idea whether that can happen in Git's master,
but it can happen in Git for Windows' master at least).

It *may* be worth it to cherry-pick this to `maint`, too, but then, it
looks as if I am the only really serious user of worktrees anyway (given
that auto-gc still corrupts worktrees' reflogs, and it is a known bug for
2 years and counting).

So I dunno. Maybe not worth bothering about in `maint`. Less work for you,
Junio.

Ciao,
Johannes


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Regression in v2.13.3, fixed in master: aliases in worktrees
  2017-07-14 14:34 Regression in v2.13.3, fixed in master: aliases in worktrees Johannes Schindelin
@ 2017-07-14 15:20 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2017-07-14 15:20 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: git

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> The bug is fixed in master already, and I cherry-picked Brandon's config-h
> series that contains the fix into Git for Windows' master branch.

As you can see in Documentation/RelNotes/2.14.0.txt, I actually have
been debating myself if that series should be merged down to 'maint'
as a general bugfix around multi-worktree area for about 3 weeks.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-07-14 15:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-14 14:34 Regression in v2.13.3, fixed in master: aliases in worktrees Johannes Schindelin
2017-07-14 15:20 ` Junio C Hamano

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).