From: Paolo Bonzini <bonzini@gnu.org>
To: git@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH 0/2] request-pull: warn if the remote object is not the same as the local one
Date: Tue, 28 May 2019 12:15:41 +0200 [thread overview]
Message-ID: <20190528101543.16094-1-bonzini@gnu.org> (raw)
From: Paolo Bonzini <pbonzini@redhat.com>
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. Patch 2 of this series makes git-request-pull remember the tag
object's SHA1 while processing the "git ls-remote" output, so that it
can be matched against the local object.
Paolo Bonzini (2):
request-pull: quote metacharacters in local ref
request-pull: warn if the remote object is not the same as the local one
git-request-pull.sh | 46 ++++++++++++++++++++++-------------
t/t5150-request-pull.sh | 53 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+), 17 deletions(-)
--
2.21.0
next reply other threads:[~2019-05-28 10:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-28 10:15 Paolo Bonzini [this message]
2019-05-28 10:15 ` [PATCH 1/2] request-pull: quote regex metacharacters in local ref Paolo Bonzini
2019-05-28 10:15 ` [PATCH 2/2] request-pull: warn if the remote object is not the same as the local one Paolo Bonzini
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190528101543.16094-1-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).