From: Duy Nguyen <pclouds@gmail.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Mark Levedahl <mlevedahl@gmail.com>,
Mikael Magnusson <mikachu@gmail.com>
Subject: Re: [PATCH v2 08/23] checkout: fix bug with --to and relative HEAD
Date: Sat, 4 Jul 2015 09:45:01 +0700 [thread overview]
Message-ID: <CACsJy8C=BZF57GqRxO6CfBAYOxywEd4zHay4cgSZMrKCv6u77w@mail.gmail.com> (raw)
In-Reply-To: <1435969052-540-9-git-send-email-sunshine@sunshineco.com>
On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine <sunshine@sunshineco.com> wrote:
> Given "git checkout --to <path> HEAD~1", the new worktree's HEAD should
> begin life at the current branch's HEAD~1, however, it actually ends up
> at HEAD~2. The happens because:
>
> 1. git-checkout resolves HEAD~1
>
> 2. to satisfy is_git_directory, prepare_linked_worktree() creates a
> HEAD in the new worktree with the value of the resolved HEAD~1
>
> 3. git-checkout re-invokes itself with the same arguments within the
> new worktree to populate the worktree
>
> 4. the sub git-checkout resolves HEAD~1 relative to its own HEAD,
> which is the resolved HEAD~1 from the original invocation,
> resulting unexpectedly and incorrectly in HEAD~2 (relative to the
> original)
>
> Fix this by unconditionally assigning the current worktree's HEAD as the
> value of the new worktree's HEAD.
Good catch!
> @@ -924,9 +925,11 @@ static int prepare_linked_checkout(const struct checkout_opts *opts,
> * value would do because this value will be ignored and
> * replaced at the next (real) checkout.
> */
This comment "any valid value would do.. will be ignored" is proved incorrect.
> + if (!resolve_ref_unsafe("HEAD", 0, rev, NULL))
> + die(_("unable to resolve HEAD"));
> strbuf_reset(&sb);
> strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
> - write_file(sb.buf, 1, "%s\n", sha1_to_hex(new->commit->object.sha1));
> + write_file(sb.buf, 1, "%s\n", sha1_to_hex(rev));
> strbuf_reset(&sb);
> strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
> write_file(sb.buf, 1, "../..\n");
--
Duy
next prev parent reply other threads:[~2015-07-04 2:45 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-04 0:17 [PATCH v2 00/23] replace "checkout --to" with "worktree add" Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 01/23] Documentation/git-checkout: fix incorrect worktree prune command Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 02/23] Documentation/git-worktree: associate options with commands Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 03/23] Documentation: move linked worktree description from checkout to worktree Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 04/23] Documentation/git-worktree: add BUGS section Eric Sunshine
2015-07-04 2:41 ` Duy Nguyen
2015-07-04 8:48 ` Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 05/23] Documentation/git-worktree: split technical info from general description Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 06/23] Documentation/git-worktree: add high-level 'lock' overview Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 07/23] Documentation/git-worktree: add EXAMPLES section Eric Sunshine
2015-07-04 2:23 ` Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 08/23] checkout: fix bug with --to and relative HEAD Eric Sunshine
2015-07-04 2:45 ` Duy Nguyen [this message]
2015-07-04 8:49 ` Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 09/23] checkout: relocate --to's "no branch specified" check Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 10/23] checkout: prepare_linked_checkout: drop now-unused 'new' argument Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 11/23] checkout: make --to unconditionally verbose Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 12/23] checkout: drop 'checkout_opts' dependency from prepare_linked_checkout Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 13/23] worktree: introduce "add" command Eric Sunshine
2015-07-04 2:53 ` Duy Nguyen
2015-07-04 8:54 ` Eric Sunshine
2015-07-06 9:24 ` Duy Nguyen
2015-07-04 0:17 ` [PATCH v2 14/23] worktree: add --force option Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 15/23] worktree: add --detach option Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 16/23] worktree: add -b/-B options Eric Sunshine
2015-07-04 3:19 ` Duy Nguyen
2015-07-04 8:57 ` Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 17/23] tests: worktree: retrofit "checkout --to" tests for "worktree add" Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 18/23] checkout: retire --to option Eric Sunshine
2015-07-04 3:04 ` Duy Nguyen
2015-07-04 8:59 ` Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 19/23] checkout: require worktree unconditionally Eric Sunshine
2015-07-04 2:33 ` Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 20/23] worktree: extract basename computation to new function Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 21/23] worktree: add: make -b/-B default to HEAD when <branch> is omitted Eric Sunshine
2015-07-06 19:14 ` Junio C Hamano
2015-07-04 0:17 ` [PATCH v2 22/23] worktree: add: auto-vivify new branch " Eric Sunshine
2015-07-04 0:17 ` [PATCH v2 23/23] checkout: retire --ignore-other-worktrees in favor of --force 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='CACsJy8C=BZF57GqRxO6CfBAYOxywEd4zHay4cgSZMrKCv6u77w@mail.gmail.com' \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mikachu@gmail.com \
--cc=mlevedahl@gmail.com \
--cc=sunshine@sunshineco.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).