From: Paolo Bonzini <bonzini@gnu.org>
To: git@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH 2/3] request-pull: use "git tag --points-at" to detect local tags
Date: Mon, 16 Feb 2015 19:16:07 +0100 [thread overview]
Message-ID: <1424110568-29479-3-git-send-email-bonzini@gnu.org> (raw)
In-Reply-To: <1424110568-29479-1-git-send-email-bonzini@gnu.org>
From: Paolo Bonzini <pbonzini@redhat.com>
If the third argument is not passed, "git show-ref --tags HEAD" will
never return anything and git-request-pull will never detect a tag
name.
Instead, "git tag --points-at" can find it. Use it if "git show-ref"
fails.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
git-request-pull.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/git-request-pull.sh b/git-request-pull.sh
index d5500fd..a507006 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -58,6 +58,7 @@ pretty_remote=${remote#refs/}
pretty_remote=${pretty_remote#heads/}
head=$(git symbolic-ref -q "$local")
head=${head:-$(git show-ref --heads --tags "$local" | cut -d' ' -f2)}
+head=${head:-$(git tag --points-at "$local" | sed 's,^,refs/tags/,')}
head=${head:-$(git rev-parse --quiet --verify "$local")}
# None of the above? Bad.
--
2.3.0
next prev parent reply other threads:[~2015-02-16 18:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-16 18:16 [PATCH 0/3] request-pull: do something if $3 is passed Paolo Bonzini
2015-02-16 18:16 ` [PATCH 1/3] request-pull: fix expected format in tests Paolo Bonzini
2015-02-16 18:16 ` Paolo Bonzini [this message]
2015-02-16 18:16 ` [PATCH 3/3] request-pull: find matching tag or branch name on remote side Paolo Bonzini
2015-02-16 19:47 ` [PATCH 0/3] request-pull: do something if $3 is passed Junio C Hamano
2015-02-17 10:12 ` Paolo Bonzini
2015-02-17 19:57 ` Junio C Hamano
2015-02-17 20:34 ` Paolo Bonzini
2015-02-17 20:42 ` Linus Torvalds
2015-02-17 20:53 ` Paolo Bonzini
2015-02-17 21:04 ` Linus Torvalds
2015-02-17 21:10 ` Paolo Bonzini
2015-02-17 21:18 ` Linus Torvalds
2015-02-18 7:11 ` Junio C Hamano
2015-02-17 21:03 ` Junio C Hamano
2015-02-17 21:08 ` Linus Torvalds
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424110568-29479-3-git-send-email-bonzini@gnu.org \
--to=bonzini@gnu.org \
--cc=git@vger.kernel.org \
--cc=pbonzini@redhat.com \
/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.
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 NNTP newsgroup(s).