Re: What's cooking in git.git (Jul 2015, #03; Fri, 10)

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Jul 10, 2015, 22:58 UTC
Message-ID: <CAPig+cRqaHszW_zA6FQ4CCurYK-Gcd83+W-jHKWwtJTVbB0RAg@mail.gmail.com>
In-Reply-To: <xmqqh9pbk4y5.fsf@gitster.dls.corp.google.com>

On Fri, Jul 10, 2015 at 6:45 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 33 quoted lines

> * es/worktree-add (2015-07-07) 23 commits
>   (merged to 'next' on 2015-07-10 at 304e329)
>  + checkout: retire --ignore-other-worktrees in favor of --force
>  + worktree: add: auto-vivify new branch when <branch> is omitted
>  + worktree: add: make -b/-B default to HEAD when <branch> is omitted
>  + worktree: extract basename computation to new function
>  + checkout: require worktree unconditionally
>  + checkout: retire --to option
>  + tests: worktree: retrofit "checkout --to" tests for "worktree add"
>  + worktree: add -b/-B options
>  + worktree: add --detach option
>  + worktree: add --force option
>  + worktree: introduce "add" command
>  + checkout: drop 'checkout_opts' dependency from prepare_linked_checkout
>  + checkout: make --to unconditionally verbose
>  + checkout: prepare_linked_checkout: drop now-unused 'new' argument
>  + checkout: relocate --to's "no branch specified" check
>  + checkout: fix bug with --to and relative HEAD
>  + Documentation/git-worktree: add EXAMPLES section
>  + Documentation/git-worktree: add high-level 'lock' overview
>  + Documentation/git-worktree: split technical info from general description
>  + Documentation/git-worktree: add BUGS section
>  + Documentation: move linked worktree description from checkout to worktree
>  + Documentation/git-worktree: associate options with commands
>  + Documentation/git-checkout: fix incorrect worktree prune command
>  (this branch uses nd/multiple-work-trees.)
>
>  Update to the "linked checkout" in 2.5.0-rc1.
>
>  Instead of "checkout --to" that does not do what "checkout"
>  normally does, move the functionality to "git worktree add".
>
>  Will merge to 'master'.

Did you want to drop the final patch[*1*] which retires --ignore-other-worktrees in favor of --force before letting this graduate to 'master'?

By the way, v1 of the follow-on series which replaces "git checkout" with "git reset --hard" to populate the new worktree is ready. I expect to send it out shortly.

[*1*]: http://thread.gmane.org/gmane.comp.version-control.git/273415/focus=273585