From: Eric Sunshine <sunshine@sunshineco.com>
Date: Sat, 04 Jul 2015 08:54:20 GMT
Subject: Re: [PATCH v2 13/23] worktree: introduce "add" command
Message-ID: <CAPig+cSKDUr2GjVqNLKQ7Cb7LooE9bvUzZXEv3cEr3kzyCuSTw@mail.gmail.com>
In-Reply-To: <CACsJy8A2eB2-t4t4oxvWiTnEFr7jJxcVBnn+zHq4uNNTk3sypg@mail.gmail.com>

On Fri, Jul 3, 2015 at 10:53 PM, Duy Nguyen <pclouds@gmail.com> wrote:
> On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine <sunshine@sunshineco.com> wrote:
>>  COMMANDS
>>  --------
>> +add <path> <branch>::
>> +
>> +Check out `<branch>` into a separate working directory, `<path>`, creating
>> +`<path>` if necessary. The new working directory is linked to the current
>> +repository, sharing everything except working directory specific files
>> +such as HEAD, index, etc. If `<path>` already exists, it must be empty.
>
> Side note, "must be empty" is an implementation limitation. I think
> the two-way merge employed by git-checkout can deal with dirty <path>
> and only perform the checkout if there is no data loss. But we can
> leave this for later.

Perhaps we should omit the bit about an existing but empty directory
for now? Like this:

    Create `<path>` and checkout `<branch>` into it. The new working
    directory is linked to the current repository, sharing everything
    except working directory specific files such as HEAD, index, etc.