From: Eric Sunshine <sunshine@sunshineco.com>
To: git@vger.kernel.org
Cc: Duy Nguyen <pclouds@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Mark Levedahl <mlevedahl@gmail.com>,
Mikael Magnusson <mikachu@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH 00/16] worktree: use "git reset --hard" to populate worktree
Date: Fri, 10 Jul 2015 20:05:30 -0400 [thread overview]
Message-ID: <1436573146-3893-1-git-send-email-sunshine@sunshineco.com> (raw)
This is a follow-on series to [1], which migrated "git checkout --to"
functionality to "git worktree add". That series continued using "git
checkout" for the initial population of the new worktree, which required
git-checkout to have too intimate knowledge that it was operating in a
newly created worktree.
This series eliminates git-checkout from the picture by instead
employing "git reset --hard"[2] to populate the new worktree initially.
It is built atop 1eb07d8 (worktree: add: auto-vivify new branch when
<branch> is omitted, 2015-07-06), currently in 'next', which is
es/worktree-add except for the final patch (which retires
--ignore-other-worktrees) since the intention[3] was to drop that patch.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/273415
[2]: http://thread.gmane.org/gmane.comp.version-control.git/273415/focus=273454
[3]: http://thread.gmane.org/gmane.comp.version-control.git/273415/focus=273585
Eric Sunshine (16):
checkout: avoid resolving HEAD unnecessarily
checkout: name check_linked_checkouts() more meaningfully
checkout: improve die_if_checked_out() robustness
checkout: die_if_checked_out: simplify strbuf management
checkout: generalize die_if_checked_out() branch name argument
branch: publish die_if_checked_out()
worktree: simplify new branch (-b/-B) option checking
worktree: introduce options container
worktree: make --detach mutually exclusive with -b/-B
worktree: make branch creation distinct from worktree population
worktree: add_worktree: construct worktree-population command locally
worktree: detect branch symref/detach and error conditions locally
worktree: make setup of new HEAD distinct from worktree population
worktree: avoid resolving HEAD unnecessarily
worktree: populate via "git reset --hard" rather than "git checkout"
checkout: drop intimate knowledge of new worktree initial population
branch.c | 65 +++++++++++++++++++++++++++++++
branch.h | 7 ++++
builtin/checkout.c | 82 +++------------------------------------
builtin/worktree.c | 110 +++++++++++++++++++++++++++++++++++------------------
4 files changed, 151 insertions(+), 113 deletions(-)
--
2.5.0.rc1.201.ga12d9f8
next reply other threads:[~2015-07-11 7:10 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-11 0:05 Eric Sunshine [this message]
2015-07-11 0:05 ` [PATCH 01/16] checkout: avoid resolving HEAD unnecessarily Eric Sunshine
2015-07-11 0:05 ` [PATCH 02/16] checkout: name check_linked_checkouts() more meaningfully Eric Sunshine
2015-07-11 0:05 ` [PATCH 03/16] checkout: improve die_if_checked_out() robustness Eric Sunshine
2015-07-11 0:05 ` [PATCH 04/16] checkout: die_if_checked_out: simplify strbuf management Eric Sunshine
2015-07-11 0:05 ` [PATCH 05/16] checkout: generalize die_if_checked_out() branch name argument Eric Sunshine
2015-07-11 0:05 ` [PATCH 06/16] branch: publish die_if_checked_out() Eric Sunshine
2015-07-11 0:05 ` [PATCH 07/16] worktree: simplify new branch (-b/-B) option checking Eric Sunshine
2015-07-11 0:05 ` [PATCH 08/16] worktree: introduce options container Eric Sunshine
2015-07-11 0:05 ` [PATCH 09/16] worktree: make --detach mutually exclusive with -b/-B Eric Sunshine
2015-07-11 0:05 ` [PATCH 10/16] worktree: make branch creation distinct from worktree population Eric Sunshine
2015-07-12 1:20 ` Duy Nguyen
2015-07-12 2:36 ` Eric Sunshine
2015-07-12 2:48 ` Duy Nguyen
2015-07-12 3:10 ` Eric Sunshine
2015-07-12 3:14 ` Eric Sunshine
2015-07-12 3:27 ` Eric Sunshine
2015-07-12 10:03 ` Duy Nguyen
[not found] ` <CACsJy8BTTdWrCZNz=y686pgju5X8-2mPrNNQ-+z4ByeKD6O5Uw@mail.gmail.com>
2015-07-12 19:20 ` Eric Sunshine
2015-07-11 0:05 ` [PATCH 11/16] worktree: add_worktree: construct worktree-population command locally Eric Sunshine
2015-07-11 0:05 ` [PATCH 12/16] worktree: detect branch symref/detach and error conditions locally Eric Sunshine
2015-07-11 0:05 ` [PATCH 13/16] worktree: make setup of new HEAD distinct from worktree population Eric Sunshine
2015-07-11 0:05 ` [PATCH 14/16] worktree: avoid resolving HEAD unnecessarily Eric Sunshine
2015-07-11 0:05 ` [PATCH 15/16] worktree: populate via "git reset --hard" rather than "git checkout" Eric Sunshine
2015-07-11 0:05 ` [PATCH 16/16] checkout: drop intimate knowledge of new worktree initial population Eric Sunshine
2015-07-13 18:36 ` [PATCH 00/16] worktree: use "git reset --hard" to populate worktree Junio C Hamano
2015-07-14 9:53 ` Michael J Gruber
2015-07-14 10:09 ` Duy Nguyen
2015-07-14 16:40 ` Eric Sunshine
2015-07-15 6:48 ` Eric Sunshine
2015-07-15 9:59 ` Duy Nguyen
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436573146-3893-1-git-send-email-sunshine@sunshineco.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mikachu@gmail.com \
--cc=mlevedahl@gmail.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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.
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).