mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <>
To: Duy Nguyen <>
Cc: Git Mailing List <>,
	Junio C Hamano <>
Subject: Re: A few "linked checkout" niggles
Date: Thu, 16 Jul 2015 01:40:18 -0400	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On Thu, Jul 16, 2015 at 1:24 AM, Duy Nguyen <> wrote:
> On Thu, Jul 16, 2015 at 6:13 AM, Junio C Hamano <> wrote:
>> I've tried to set up a non-bare clone of git.git at ~/w/src and
>> attached one of its branches to a separate work tree at ~/w/rerere
>>  ~/w/src$ git worktree add ../rerere jc/rerere
>> Then I tried the "multiple checkout not allowed".
>>  ~/w/src$ git checkout jc/rerere
>>  fatal: 'jc/rerere' is already checked out at '/home/gitster/w/rerere/.git'
>> You see the first "niggle" above.  Do we need "/.git" at the end?
>> That is hopefully merely cosmetic and I am guessing that we can
>> unconditionally drop "/.git" from the end, but maybe there are
>> subtle reasons why it may not be a good idea (e.g. introduces some
>> ambiguities?)

I can't think of any ambiguities which might arise from stripping the
.git suffix. Even when playing with GIT_COMMON_DIR and GIT_WORK_TREE,
I don't notice any ambiguities.

Since I'm already touching this code and am wrapping up v2 of [1], I
can easily plop in a fix for this cosmetic issue.

>> There is another, a more serious one.
>>  ~/w/src$ git fetch ../git.git jc/rerere:jc/rerere
>> This succeeds, without checking if there is a work tree that has it
>> checked out.  I think the safety in "git fetch" that can be disabled
>> by "--update-head-ok" option should be updated to reuse the same
>> protection used by the updated "git checkout".
>> Something to work on for 2.5.x maintenance track, aiming for 2.5.1.
> To keep things clear, Eric if you want these they are yours :-) I'll
> focus on the submodule support after i'm done with all my bug fix
> patches.

I want to focus on getting v2 of [1] out and finalized. After that, I
might be able to take a look at the git-fetch issue (but I won't
complain if you get to it first).


  reply	other threads:[~2015-07-16  5:40 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-15 23:13 A few "linked checkout" niggles Junio C Hamano
2015-07-16  5:24 ` Duy Nguyen
2015-07-16  5:40   ` Eric Sunshine [this message]
2015-07-16 20:39 ` Junio C Hamano
2015-07-16 23:13   ` Duy Nguyen
2015-07-17  3:11     ` Eric Sunshine
2015-07-17 12:27 ` Michael J Gruber
2015-07-17 12:49   ` Duy Nguyen
2015-07-17 15:19     ` Junio C Hamano
2015-07-17 17:07       ` Eric Sunshine
2015-07-17 17:02     ` Eric Sunshine

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='' \ \ \ \ \

* 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

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