From: Michael J Gruber <git@drmicha.warpmail.net>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH] checkout: --to requires directory
Date: Mon, 23 Feb 2015 16:01:51 +0100 [thread overview]
Message-ID: <54EB40DF.8090800@drmicha.warpmail.net> (raw)
In-Reply-To: <20150223144214.GA31624@peff.net>
Jeff King venit, vidit, dixit 23.02.2015 15:42:
> On Mon, Feb 23, 2015 at 03:16:59PM +0100, Michael J Gruber wrote:
>
>> --to requires a directory, not a file. Say so in the usage string.
>
> Sounds like a good goal, but...
>
>> - OPT_FILENAME(0, "to", &opts.new_worktree,
>> + OPT_STRING(0, "to", &opts.new_worktree, N_("dir"),
>> N_("check a branch out in a separate working directory")),
>
> OPT_FILENAME also calls fix_filename(), which munges the filename so
> that relative paths given by the user will work, even though git has
> chdir'd to the root of the working tree.
Ooops, I wasn't aware of that. We do use OPT_STRING in quite a few
places for directories, though.
> So you need to handle that somewhere. I think it might be less painful
> to teach OPT_FILENAME to be more flexible in the usage message it
> prints.
We have at least path, template-dir dir which can benefit from that.
After Junio's call, I'm trying to look a bit at list-files and multiple
workdirs. I guess I should collect those bits.
BTW: multiple workdirs commit messages and doc talk about a hard link
named "link" in worktrees/<id>/, but I don't get any from "checkout --to".
Instead, and in addition to the expected "gitdir", I get a file
"gitfile" whose content is a relative path (*not* prefixed with "gitdir:
"), probably to the worktree .git gitfile (relative from the base
worktree). But "gitdir" "points to" the same, using (i.e. it contains)
an absolute path.
I can't quite make sense of this. Maybe the doc is behind? But still.
"gitdir" and "gitfile" pointing to the same file.
Michael
next prev parent reply other threads:[~2015-02-23 15:02 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-23 14:16 [PATCH] checkout: --to requires directory Michael J Gruber
2015-02-23 14:42 ` Jeff King
2015-02-23 15:01 ` Michael J Gruber [this message]
2015-02-23 16:17 ` [PATCH 0/4] OPT_{FILENAME,PATH} Michael J Gruber
2015-02-23 16:17 ` [PATCH 1/4] parse-options: introduce OPT_PATH Michael J Gruber
2015-02-23 19:23 ` Junio C Hamano
2015-02-24 15:49 ` Michael J Gruber
2015-02-23 20:06 ` Philip Oakley
2015-02-23 16:17 ` [PATCH 2/4] option-strings: use OPT_FILENAME Michael J Gruber
2015-02-23 17:44 ` Jeff King
2015-02-23 19:08 ` Junio C Hamano
2015-02-23 20:31 ` Junio C Hamano
2015-02-23 16:17 ` [PATCH 3/4] option-strings: use OPT_PATH Michael J Gruber
2015-02-23 18:26 ` Jeff King
2015-02-23 21:07 ` Junio C Hamano
2015-02-23 21:12 ` Jeff King
2015-02-23 16:17 ` [PATCH 4/4] checkout: --to requires directory Michael J Gruber
2015-02-24 0:34 ` [PATCH] " 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=54EB40DF.8090800@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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).