Re: [PATCH v2 7/8] checkout: prefix --to argument properly when cwd is moved

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 29, 2014, 20:51 UTC
Message-ID: <xmqq8unb3n3m.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1406641831-2390-8-git-send-email-pclouds@gmail.com>

Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:

Show 18 quoted lines

> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
>  builtin/checkout.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index 173aab1..4fbb9c1 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -1342,7 +1342,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
>  			 N_("do not limit pathspecs to sparse entries only")),
>  		OPT_HIDDEN_BOOL(0, "guess", &dwim_new_local_branch,
>  				N_("second guess 'git checkout no-such-branch'")),
> -		OPT_STRING(0, "to", &opts.new_worktree, N_("path"),
> +		OPT_FILENAME(0, "to", &opts.new_worktree,
>  			   N_("check a branch out in a separate working directory")),
>  		OPT_END(),
>  	};

Good thinking. Otherwise this would not work from within a subdirectory. Perhaps you would want a test for it?

An unrelated tangent, but would we want to further enhance OPT_FILENAME() to understand ~/path and ~user/path perhaps? It is easy to rely on users' shells to do so, so it is not a big deal and it certainly is unrelated to this particular topic.