From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: doron.behar@gmail.com, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 1/2] parse-options: expand $HOME on filename options
Date: Wed, 14 Feb 2018 17:51:48 +0700 [thread overview]
Message-ID: <20180214105149.28896-1-pclouds@gmail.com> (raw)
In-Reply-To: <20180214101019.gaenosifgq3wx2nm@NUC.localdomain>
When you specify "--path ~/foo", the shell will automatically expand
~/foo to $HOME/foo before it's passed to git. The expansion is not done
on "--path=~/foo". An experienced user sees the difference but it could
still be confusing for others (especially when tab-completion still
works on --path=~/foo).
Support $HOME expansion for all filename options. There are about seven
of them.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
parse-options.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/parse-options.c b/parse-options.c
index d265a756b5..c33f14c74e 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -38,10 +38,13 @@ static int get_arg(struct parse_opt_ctx_t *p, const struct option *opt,
static void fix_filename(const char *prefix, const char **file)
{
- if (!file || !*file || !prefix || is_absolute_path(*file)
- || !strcmp("-", *file))
+ if (!file || !*file || is_absolute_path(*file) ||
+ !strcmp("-", *file))
return;
- *file = prefix_filename(prefix, *file);
+ if (**file == '~')
+ *file = expand_user_path(*file, 0);
+ else if (prefix)
+ *file = prefix_filename(prefix, *file);
}
static int opt_command_mode_error(const struct option *opt,
--
2.16.1.435.g8f24da2e1a
next prev parent reply other threads:[~2018-02-14 10:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-14 10:10 [BUG] git init doesn't respect `--template` like configuration variable init.templateDir and $GIT_TEMPLATE_DIR Doron Behar
2018-02-14 10:51 ` Nguyễn Thái Ngọc Duy [this message]
2018-02-14 10:51 ` [PATCH 2/2] init-db: change --template type to OPTION_FILENAME Nguyễn Thái Ngọc Duy
2018-02-14 14:08 ` Jeff King
2018-02-14 14:05 ` [PATCH 1/2] parse-options: expand $HOME on filename options Jeff King
2018-02-14 18:24 ` Junio C Hamano
2018-02-14 22:46 ` Ævar Arnfjörð Bjarmason
2018-02-15 18:36 ` Junio C Hamano
2018-02-22 9:26 ` Duy Nguyen
2018-02-22 13:38 ` Ævar Arnfjörð Bjarmason
2018-02-23 10:11 ` 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
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=20180214105149.28896-1-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=doron.behar@gmail.com \
--cc=git@vger.kernel.org \
/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).