Re* How to generate pull-request with info of signed tag
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:52:39
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: Re* How to generate pull-request with info of signed tag · Aneesh Kumar K.V <hidden>
- 2016-06-15 · Re: Re* How to generate pull-request with info of signed tag · Junio C Hamano <hidden>
- 2016-06-15 · Re: Re* How to generate pull-request with info of signed tag · Aneesh Kumar K.V <hidden>
- 2016-06-15 · Re: Re* How to generate pull-request with info of signed tag · Junio C Hamano <hidden>
- 2016-06-15 · Re: Re* How to generate pull-request with info of signed tag · Junio C Hamano <hidden>
"Aneesh Kumar K.V" [off-list ref] writes:
I am using git from master branch and wanted to try the signed pull request. I have pushed the signed tag to repo.or.cz, but not sure how to generate pull request with signed tag information?
The correct script should grok the following command line:
$ git request-pull v1.7.7.4 git://git.kernel.org/pub/scm/git/git.git v1.7.7.5
and include
are available in the git repository at
git://git.kernel.org/.../git.git tag v1.7.7.5
for you to fetch changes up to 66c1...
but we didn't loosen the code that inspects the publishing repository to
allow asking for a tag that points at an older part of the history to be
pulled.
Here is an update.
-- >8 --
Subject: request-pull: update the "pull" command generation logic
The old code that insisted on asking for the tip of a branch to be pulled
were not updated when we started allowing for a tag to be pulled. When a
tag points at an older part of the history and there is no branch that
points at the tagged commit, the script failed to say which ref is to be
pulled.
Signed-off-by: Junio C Hamano <redacted>
---
git-request-pull.sh | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/git-request-pull.sh b/git-request-pull.sh
index c6a5b7a..7b5c777 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh@@ -57,12 +57,40 @@ headrev=$(git rev-parse --verify "$head"^0) || exit merge_base=$(git merge-base $baserev $headrev) || die "fatal: No commits in common between $base and $head" -find_matching_branch="/^$headrev "'refs\/heads\//{ - s/^.* refs\/heads\/// - p - q -}' -branch=$(git ls-remote "$url" | sed -n -e "$find_matching_branch") +# $head is the token given from the command line. If a ref with that +# name exists at the remote and their values match, we should use it. +# Otherwise find a ref that matches $headrev. +find_matching_ref=' + sub abbr { + my $ref = shift; + if ($ref =~ s|refs/heads/||) { + return $ref; + } elsif ($ref =~ s|refs/tags/||) { + return "tag $ref"; + } else { + return $ref; + } + } + + my ($exact, $found); + while (<STDIN>) { + my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/; + next unless ($sha1 eq $ARGV[1]); + $found = abbr($ref); + if ($ref =~ m|/\Q$ARGV[0]\E$|) { + $exact = $found; + last; + } + } + if ($exact) { + print "$exact\n"; + } elsif ($found) { + print "$found\n"; + } +' + +ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev") + url=$(git ls-remote --get-url "$url") git show -s --format='The following changes since commit %H:
@@ -71,7 +99,7 @@ git show -s --format='The following changes since commit %H: are available in the git repository at: ' $baserev && -echo " $url${branch+ $branch}" && +echo " $url${ref+ $ref}" && git show -s --format=' for you to fetch changes up to %H:
@@ -81,7 +109,7 @@ for you to fetch changes up to %H: if test -n "$branch_name" then - echo "(from the branch description for $branch local branch)" + echo "(from the branch description for $branch_name local branch)" echo git config "branch.$branch_name.description" fi &&
@@ -101,7 +129,7 @@ fi && git shortlog ^$baserev $headrev && git diff -M --stat --summary $patch $merge_base..$headrev || status=1 -if test -z "$branch" +if test -z "$ref" then echo "warn: No branch of $url is at:" >&2 git show -s --format='warn: %h: %s' $headrev >&2