From: Eric Sunshine <sunshine@sunshineco.com>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, Git List <git@vger.kernel.org>
Subject: Re: [RFC/PATCH] worktree: replace "checkout --to" with "worktree new"
Date: Thu, 2 Jul 2015 13:06:25 -0400 [thread overview]
Message-ID: <CAPig+cR1uLa7yiDn9EnTzfkDTOoToc6BTDRn5sYr12yPr6rXPg@mail.gmail.com> (raw)
In-Reply-To: <CACsJy8CYtey9d6dFhf+bKCPe0aKzm1GNURDR0sJ4NNEmdZeLGQ@mail.gmail.com>
On Thu, Jul 2, 2015 at 8:50 AM, Duy Nguyen <pclouds@gmail.com> wrote:
> On Thu, Jul 2, 2015 at 7:41 PM, Duy Nguyen <pclouds@gmail.com> wrote:
>>> merge_working_tree:
>>> tree = parse_tree_indirect(old->commit &&
>>> !opts->new_worktree_mode ?
>>> old->commit->object.sha1 :
>>> EMPTY_TREE_SHA1_BIN);
>>
>> I think it's to make sure empty sha-1 is used with --to. If
>> old->commit->object.sha1 is used and it's something, a real two way
>> merge may happen probably with not-so-fun consequences. If it's empty
>> sha1, the effect is like "reset --hard", silent and reliable..
>>
>>> switch_branches:
>>> if (!opts->quiet && !old.path && old.commit &&
>>> new->commit != old.commit && !opts->new_worktree_mode)
>>> orphaned_commit_warning(old.commit, new->commit);
>>
>> to suppress misleading warning if old.commit happens to be something.
>
> Actually you may be right about not reverting these. We prepare the
> new worktree with a valid HEAD, that would make "old" valid and may
> trigger things if "git checkout" is used to populate the worktree. To
> suppress those "things", we need new_worktree_mode or something
> similar.
Indeed. Since this is merely a private implementation detail, we don't
necessarily have to resolve the issue fully for the "checkout --to" to
"worktree add" conversion. It can be dealt with in a follow-on patch.
> Unless we want to borrow fancy checkout options for "git worktree
> add", we probably should just export checkout() function from clone.c
> and use it instead of "git checkout". Much more lightweight and
> simpler (it's one-way merge). Then we can revert checkout.c to the
> version before "--to".
Interesting idea, but doesn't this lose the ability to create a new
branch ("worktree add foo -b bar") and other useful options like
--track?
next prev parent reply other threads:[~2015-07-02 17:06 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 4:56 [RFC/PATCH] worktree: replace "checkout --to" with "worktree new" Eric Sunshine
2015-06-30 9:23 ` Duy Nguyen
2015-06-30 16:33 ` Junio C Hamano
2015-07-01 10:46 ` Duy Nguyen
2015-06-30 22:02 ` Eric Sunshine
2015-07-01 6:37 ` Eric Sunshine
2015-06-30 17:13 ` Junio C Hamano
2015-06-30 22:11 ` Eric Sunshine
2015-06-30 22:27 ` Junio C Hamano
2015-07-01 4:48 ` Mikael Magnusson
2015-06-30 22:32 ` Mark Levedahl
2015-07-01 16:53 ` Junio C Hamano
2015-07-01 17:13 ` Eric Sunshine
2015-07-01 17:16 ` Eric Sunshine
2015-07-01 17:32 ` Junio C Hamano
2015-07-01 18:18 ` Eric Sunshine
2015-07-01 18:52 ` Junio C Hamano
2015-07-02 1:07 ` Duy Nguyen
2015-07-02 2:52 ` Eric Sunshine
2015-07-02 12:41 ` Duy Nguyen
2015-07-02 12:50 ` Duy Nguyen
2015-07-02 17:06 ` Eric Sunshine [this message]
2015-07-02 22:41 ` Duy Nguyen
2015-07-02 16:59 ` Eric Sunshine
2015-07-02 18:45 ` Eric Sunshine
2015-07-02 19:00 ` Eric Sunshine
2015-07-02 19:19 ` 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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPig+cR1uLa7yiDn9EnTzfkDTOoToc6BTDRn5sYr12yPr6rXPg@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).