user/sven/git.git/git-request-pull.sh, branch v2.26.0-rc2

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

request-pull: resurrect "pretty refname" feature

2014-02-25T21:45:38Z

When asking to fetch/pull a branch whose name is B or a tag whose name is T, we used to show the command to run as: git pull $URL B git pull $URL tags/T even when B and T were spelled in a more qualified way in order to disambiguate, e.g. heads/B or refs/tags/T, but the recent update lost this feature. Resurrect it. Signed-off-by: Junio C Hamano

request-pull: pick up tag message as before

2014-02-25T20:53:40Z

The previous two steps were meant to stop updating the explicit refname the user gave to the command to a different ref that points at it. Most notably, we no longer substitute a branch name the user used with a name of the tag that points at the commit at the tip of the branch (it still can be done with "local-branch:remote-tag"). However, they also lost the code that included the message in a tag when the user _did_ ask the tag to be pulled. Resurrect it. Signed-off-by: Junio C Hamano

request-pull: allow "local:remote" to specify names on both ends

2014-02-25T20:52:59Z

This allows a user to say that a local branch has a different name on the remote server, using the same syntax that "git push" uses to create that situation. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano