git/git-request-pull.sh, branch v2.48.2

Makefile: consistently use PERL_PATH

2024-12-06T22:52:09Z

When injecting the Perl path into our scripts we sometimes use '@PERL@' while we othertimes use '@PERL_PATH@'. Refactor the code use the latter consistently, which makes it easier to reuse the same logic for multiple scripts. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

Makefile: consistently use @PLACEHOLDER@ to substitute

2024-12-06T22:52:08Z

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 Signed-off-by: Junio C Hamano

request-pull: filter out SSH/X.509 tag signatures

2023-01-25T23:54:41Z

git request-pull filters PGP signatures out of the tag message, but not SSH or X.509 signatures. Signed-off-by: Gwyneth Morgan Signed-off-by: Junio C Hamano

request-pull: warn if the remote object is not the same as the local one

2019-05-28T20:06:25Z

In some cases, git request-pull might be invoked with remote and local objects that differ even though they point to the same commit. For example, the remote object might be a lightweight tag vs. an annotated tag on the local side; or the user might have reworded the tag locally and forgotten to push it. When this happens git-request-pull will not warn, because it only checks that "git ls-remote" returns an SHA1 that matches the local commit (known as $headrev in the script). This patch makes git-request-pull retrieve the tag object SHA1 while processing the "git ls-remote" output, so that it can be matched against the local object. Signed-off-by: Paolo Bonzini Signed-off-by: Junio C Hamano

request-pull: quote regex metacharacters in local ref

2019-05-28T20:06:21Z

The local part of the third argument of git-request-pull is used in a regular expression without quoting it. Use qr{} and \Q\E to ensure that e.g. a period in a tag name does not match any character on the remote side. Signed-off-by: Paolo Bonzini Signed-off-by: Junio C Hamano

request-pull: capitalise "Git" to make it a proper noun

2017-10-03T04:11:57Z

Of the many ways to spell the three-letter word, the variant "Git" should be used when referring to a repository in a description; or, in general, when it is used as a proper noun. We thus change the pull-request template message so that it reads "...in the Git repository at:" Besides, this brings us in line with the documentation, see Documentation/howto/using-signed-tag-in-pull-request.txt Signed-off-by: Ann T Ropea Acked-by: Jonathan Nieder Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

request-pull: drop old USAGE stuff

2017-01-16T00:23:23Z

request-pull uses OPTIONS_SPEC, so no need for (meanwhile incomplete) USAGE and LONG_USAGE anymore. Signed-off-by: Wolfram Sang Signed-off-by: Junio C Hamano

Merge branch 'lt/request-pull'

2014-05-19T17:35:36Z

* lt/request-pull: request-pull: resurrect for-linus -> tags/for-linus DWIM

request-pull: resurrect for-linus -> tags/for-linus DWIM

2014-05-16T17:18:25Z

Older versions of Git before v1.7.10 did not DWIM $ git pull $URL for-linus to the tag "tags/for-linus" and the users were required to say $ git pull $URL tags/for-linus instead. Because newer versions of Git works either way, request-pull used to show tags/for-linus when asked $ git request-pull origin/master $URL for-linus The recent updates broke this and in the output we see "for-linus" without the "tags/" prefix. As v1.7.10 is more than 2 years old, this should matter very little in practice, but resurrecting it is very simple. Signed-off-by: Junio C Hamano

Merge branch 'lt/request-pull'

2014-03-21T19:50:44Z

Discard the accumulated "heuristics" to guess from which branch the result wants to be pulled from and make sure what the end user specified is not second-guessed by "git request-pull", to avoid mistakes. * lt/request-pull: request-pull: documentation updates request-pull: resurrect "pretty refname" feature request-pull: test updates request-pull: pick up tag message as before request-pull: allow "local:remote" to specify names on both ends request-pull: more strictly match local/remote branches