summaryrefslogtreecommitdiffstats
path: root/git-request-pull.sh
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2024-12-06 14:24:37 +0100
committerJunio C Hamano <gitster@pobox.com>2024-12-06 23:52:08 +0100
commitdbe46c0feb25417d01267bb97edb861694ed023d (patch)
treee2fc4a150cff65824a97cbc1e9f1101594f608fc /git-request-pull.sh
parentMakefile: use common template for GIT-BUILD-OPTIONS (diff)
downloadgit-dbe46c0feb25417d01267bb97edb861694ed023d.tar.xz
git-dbe46c0feb25417d01267bb97edb861694ed023d.zip
Makefile: consistently use @PLACEHOLDER@ to substitute
We have a bunch of placeholders in our scripts that we replace at build time, for example by using sed(1). These placeholders come in three different formats: @PLACEHOLDER@, @@PLACEHOLDER@@ and ++PLACEHOLDER++. Next to being inconsistent it also creates a bit of a problem with CMake, which only supports the first syntax in its `configure_file()` function. To work around that we instead manually replace placeholders via string operations, which is a hassle and removes safeguards that CMake has to verify that we didn't forget to replace any placeholders. Besides that, other build systems like Meson also support the CMake syntax. Unify our codebase to consistently use the syntax supported by such build systems. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-request-pull.sh')
-rwxr-xr-xgit-request-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh
index 01640a044b..10c88639e2 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -112,7 +112,7 @@ find_matching_ref='
}
'
-set fnord $(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
+set fnord $(git ls-remote "$url" | @PERL@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
remote_sha1=$2
ref=$3