From: Chris Rorvick <chris@rorvick.com>
To: git@vger.kernel.org
Cc: Chris Rorvick <chris@rorvick.com>,
Angelo Borsotti <angelo.borsotti@gmail.com>,
Drew Northup <n1xim.email@gmail.com>,
Michael Haggerty <mhagger@alum.mit.edu>,
Philip Oakley <philipoakley@iee.org>,
Johannes Sixt <j6t@kdbg.org>,
Kacper Kornet <draenog@pld-linux.org>, Jeff King <peff@peff.net>,
Felipe Contreras <felipe.contreras@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 7/7] push: clarify rejection of update to non-commit-ish
Date: Thu, 22 Nov 2012 22:21:55 -0600 [thread overview]
Message-ID: <1353644515-17349-8-git-send-email-chris@rorvick.com> (raw)
In-Reply-To: <1353644515-17349-1-git-send-email-chris@rorvick.com>
Pushes must already (by default) update to a commit-ish due the fast-
forward check in set_ref_status_for_push(). But rejecting for not being
a fast-forward suggests the situation can be resolved with a merge.
Flag these updates (i.e., to a blob or a tree) as not forwardable so the
user is presented with more appropriate advice.
Signed-off-by: Chris Rorvick <chris@rorvick.com>
---
remote.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/remote.c b/remote.c
index f5bc4e7..ee0c1e5 100644
--- a/remote.c
+++ b/remote.c
@@ -1291,6 +1291,11 @@ static inline int is_forwardable(struct ref* ref)
if (!o || o->type != OBJ_COMMIT)
return 0;
+ /* new object must be commit-ish */
+ o = deref_tag(parse_object(ref->new_sha1), NULL, 0);
+ if (!o || o->type != OBJ_COMMIT)
+ return 0;
+
return 1;
}
--
1.8.0.209.gf3828dc
next prev parent reply other threads:[~2012-11-23 4:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-23 4:21 [PATCH v5 0/7] push: update remote tags only with force Chris Rorvick
2012-11-23 4:21 ` [PATCH 1/7] push: return reject reasons via a mask Chris Rorvick
2012-11-26 18:43 ` Junio C Hamano
2012-11-27 3:00 ` Chris Rorvick
2012-11-23 4:21 ` [PATCH 2/7] push: add advice for rejected tag reference Chris Rorvick
2012-11-23 4:21 ` [PATCH 3/7] push: flag updates Chris Rorvick
2012-11-23 4:21 ` [PATCH 4/7] push: flag updates that require force Chris Rorvick
2012-11-23 4:21 ` [PATCH 5/7] push: require force for refs under refs/tags/ Chris Rorvick
2012-11-26 18:57 ` Junio C Hamano
2012-11-27 4:17 ` Chris Rorvick
2012-11-27 17:12 ` Junio C Hamano
2012-11-28 5:18 ` [PATCH] push: cleanup push rules comment Chris Rorvick
2012-11-28 16:58 ` Junio C Hamano
2012-11-23 4:21 ` [PATCH 6/7] push: require force for annotated tags Chris Rorvick
2012-11-23 4:21 ` Chris Rorvick [this message]
2012-11-26 18:53 ` [PATCH 7/7] push: clarify rejection of update to non-commit-ish Junio C Hamano
2012-11-27 3:52 ` Chris Rorvick
2012-11-27 17:11 ` Junio C Hamano
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=1353644515-17349-8-git-send-email-chris@rorvick.com \
--to=chris@rorvick.com \
--cc=angelo.borsotti@gmail.com \
--cc=draenog@pld-linux.org \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=mhagger@alum.mit.edu \
--cc=n1xim.email@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
/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).