From: tboegi@web.de
To: git@vger.kernel.org, d.torilov@gmail.com
Subject: [PATCH v2 2/2] MacOs: Precompose startup_info->prefix
Date: Sun, 4 Apr 2021 08:17:54 +0200 [thread overview]
Message-ID: <20210404061754.19428-1-tboegi@web.de> (raw)
In-Reply-To: <xmqqtuotfre5.fsf@gitster.g>
From: Torsten Bögershausen <tboegi@web.de>
The "prefix" was precomposed for MacOs in commit 5c327502db,
MacOS: precompose_argv_prefix()
However, this commit forgot to update "startup_info->prefix" after
precomposing.
Re-arrange the code in setup.c:
Move the (possible) precomposition towards the end of
setup_git_directory_gently(), so that precompose_string_if_needed()
can use git_config_get_bool("core.precomposeunicode") correctly.
Keep prefix, startup_info->prefix and GIT_PREFIX_ENVIRONMENT all in sync.
And as a result, the prefix no longer needs to be precomposed in git.c
Reported-by: Dmitry Torilov <d.torilov@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
---
This part did never made it to the list - it should have gone only
to tboegi@web.de
git send-email decided to cc to the "Helped-by" and "Reported-by" addresses,
a feature that I was not aware of - and can be turned off with --suppress-cc=all
In other words, I typically send these emails only to my self first, re-read
with fresh eyes, and then send them out. End of of blabla.
Changes since V1:
Add a comment in setup.c, to make more clear that git_config_get_bool()
is called, and the setup_XXX() must have prepared everything needed.
git.c | 2 +-
setup.c | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/git.c b/git.c
index 9bc077a025..b53e665671 100644
--- a/git.c
+++ b/git.c
@@ -423,7 +423,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
int nongit_ok;
prefix = setup_git_directory_gently(&nongit_ok);
}
- prefix = precompose_argv_prefix(argc, argv, prefix);
+ precompose_argv_prefix(argc, argv, NULL);
if (use_pager == -1 && p->option & (RUN_SETUP | RUN_SETUP_GENTLY) &&
!(p->option & DELAY_PAGER_CONFIG))
use_pager = check_pager_config(p->cmd);
diff --git a/setup.c b/setup.c
index c04cd25a30..dcc9c41a85 100644
--- a/setup.c
+++ b/setup.c
@@ -1281,10 +1281,6 @@ const char *setup_git_directory_gently(int *nongit_ok)
} else {
startup_info->have_repository = 1;
startup_info->prefix = prefix;
- if (prefix)
- setenv(GIT_PREFIX_ENVIRONMENT, prefix, 1);
- else
- setenv(GIT_PREFIX_ENVIRONMENT, "", 1);
}
/*
@@ -1311,6 +1307,16 @@ const char *setup_git_directory_gently(int *nongit_ok)
if (startup_info->have_repository)
repo_set_hash_algo(the_repository, repo_fmt.hash_algo);
}
+ /* Keep prefix, startup_info->prefix and GIT_PREFIX_ENVIRONMENT in sync */
+ prefix = startup_info->prefix;
+ if (prefix) {
+ /* This calls git_config_get_bool() under the hood (MacOs only) */
+ prefix = precompose_string_if_needed(prefix);
+ startup_info->prefix = prefix;
+ setenv(GIT_PREFIX_ENVIRONMENT, prefix, 1);
+ } else {
+ setenv(GIT_PREFIX_ENVIRONMENT, "", 1);
+ }
strbuf_release(&dir);
strbuf_release(&gitdir);
--
2.30.0.155.g66e871b664
next prev parent reply other threads:[~2021-04-04 6:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-29 22:33 [PATCH] chore: use prefix from startup_info Dmitry Torilov via GitGitGadget
2021-03-29 23:53 ` Junio C Hamano
2021-03-31 5:04 ` Torsten Bögershausen
2021-04-04 6:17 ` [PATCH v2 1/2] precompose_utf8: Make precompose_string_if_needed() public tboegi
2021-04-04 6:17 ` tboegi [this message]
2021-04-04 7:58 ` [PATCH v2 2/2] MacOs: Precompose startup_info->prefix Junio C Hamano
2021-04-04 17:14 ` [PATCH v3 1/2] precompose_utf8: Make precompose_string_if_needed() public tboegi
2021-04-04 17:14 ` [PATCH v3 2/2] MacOs: Precompose startup_info->prefix tboegi
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=20210404061754.19428-1-tboegi@web.de \
--to=tboegi@web.de \
--cc=d.torilov@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.
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).