From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH] config: introduce an Operating System-specific `includeIf` condition
Date: Mon, 21 Nov 2022 13:39:52 +0000 [thread overview]
Message-ID: <pull.1429.git.1669037992587.gitgitgadget@gmail.com> (raw)
From: Johannes Schindelin <johannes.schindelin@gmx.de>
It is relatively common for users to maintain identical `~/.gitconfig`
files across all of their setups, using the `includeIf` construct
liberally to adjust the settings to the respective setup as needed.
In case of Operating System-specific adjustments, Git currently offers
no support to the users and they typically use a work-around like this:
[includeIf "gitdir:/home/"]
path = ~/.gitconfig-linux
[includeIf "gitdir:/Users/"]
path = ~/.gitconfig-mac
[includeIf "gitdir:C:"]
path = ~/.gitconfig-windows
However, this is fragile, as it would not even allow to discern between
Operating Systems that happen to host their home directories in
`/home/`, such as Linux and the BSDs.
Let's introduce a new condition: `os:<uname-s>` where `<uname-s>` is the
system name, i.e. the output of `uname -s`.
This addresses https://github.com/git-for-windows/git/issues/4125
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
config: introduce an Operating System-specific includeIf condition
I was about to write up guidelines how to write this patch, but it
turned out that it was much faster to write the patch instead.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1429%2Fdscho%2Finclude-if-os-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1429/dscho/include-if-os-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1429
Documentation/config.txt | 5 +++++
config.c | 11 +++++++++++
t/t1309-early-config.sh | 16 ++++++++++++++++
3 files changed, 32 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e376d547ce0..2db73d8228e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -186,6 +186,11 @@ As for the naming of this keyword, it is for forwards compatibiliy with
a naming scheme that supports more variable-based include conditions,
but currently Git only supports the exact keyword described above.
+`os`::
+ The data that follows this keyword is taken as the name of an
+ Operating System; If it matches the output of `uname -s`, the
+ include condition is met.
+
A few more notes on matching via `gitdir` and `gitdir/i`:
* Symlinks in `$GIT_DIR` are not resolved before matching.
diff --git a/config.c b/config.c
index 9b0e9c93285..9ab311ae99b 100644
--- a/config.c
+++ b/config.c
@@ -394,6 +394,15 @@ static int include_by_remote_url(struct config_include_data *inc,
inc->remote_urls);
}
+static int include_by_os(const char *cond, size_t cond_len)
+{
+ struct utsname uname_info;
+
+ return !uname(&uname_info) &&
+ !strncasecmp(uname_info.sysname, cond, cond_len) &&
+ !uname_info.sysname[cond_len];
+}
+
static int include_condition_is_true(struct config_include_data *inc,
const char *cond, size_t cond_len)
{
@@ -408,6 +417,8 @@ static int include_condition_is_true(struct config_include_data *inc,
else if (skip_prefix_mem(cond, cond_len, "hasconfig:remote.*.url:", &cond,
&cond_len))
return include_by_remote_url(inc, cond, cond_len);
+ else if (skip_prefix_mem(cond, cond_len, "os:", &cond, &cond_len))
+ return include_by_os(cond, cond_len);
/* unknown conditionals are always false */
return 0;
diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
index 537435b90ae..7da67af06e7 100755
--- a/t/t1309-early-config.sh
+++ b/t/t1309-early-config.sh
@@ -100,4 +100,20 @@ test_expect_success 'onbranch config outside of git repo' '
nongit git help
'
+test_expect_success '[includeIf "os:..."]' '
+ test_config x.y 0 &&
+ echo "[x] y = z" >.git/xyz &&
+
+ if test_have_prereq MINGW
+ then
+ uname_s=Windows
+ else
+ uname_s="$(uname -s)"
+ fi &&
+ test_config "includeIf.os:not-$uname_s.path" xyz &&
+ test 0 = "$(git config x.y)" &&
+ test_config "includeIf.os:$uname_s.path" xyz &&
+ test z = "$(git config x.y)"
+'
+
test_done
base-commit: e4a4b31577c7419497ac30cebe30d755b97752c5
--
gitgitgadget
next reply other threads:[~2022-11-21 13:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-21 13:39 Johannes Schindelin via GitGitGadget [this message]
2022-11-21 13:51 ` [PATCH] config: introduce an Operating System-specific `includeIf` condition Ævar Arnfjörð Bjarmason
2022-11-21 15:51 ` Phillip Wood
2022-11-21 19:18 ` Johannes Schindelin
2022-11-21 19:19 ` [PATCH v2] " Johannes Schindelin via GitGitGadget
2022-11-21 23:32 ` Jeff King
2022-11-23 11:54 ` Đoàn Trần Công Danh
2022-11-24 0:56 ` Jeff King
2022-11-22 14:01 ` Ævar Arnfjörð Bjarmason
2022-11-22 14:31 ` Phillip Wood
2022-11-23 0:16 ` Junio C Hamano
2022-11-23 15:07 ` Phillip Wood
2022-11-23 23:51 ` Junio C Hamano
2022-11-22 18:40 ` Philippe Blain
2022-11-23 10:40 ` Philip Oakley
2022-11-25 7:31 ` Junio C Hamano
2023-04-17 7:04 ` Samuel Ferencik
2023-04-17 18:46 ` Junio C Hamano
2023-04-18 2:04 ` Felipe Contreras
2023-04-19 12:22 ` Johannes Schindelin
2023-04-19 14:26 ` Chris Torek
2023-04-19 14:32 ` Samuel Ferencik
2023-04-19 15:21 ` rsbecker
2023-04-19 16:07 ` Junio C Hamano
2023-04-19 16:14 ` Junio C Hamano
2022-11-22 0:03 ` [PATCH] " Junio C Hamano
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=pull.1429.git.1669037992587.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/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).