undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push: require force for annotated tags

Browse Source 
Do not allow fast-forwarding of references that point to a tag object.
Updating from a tag is potentially destructive since it would likely
leave the tag dangling.  Disallowing updates to a tag also makes sense
semantically and is consistent with the behavior of lightweight tags.

Signed-off-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Chris Rorvick 2012-11-29 19:41:38 -06:00 committed by Junio C Hamano
parent dbfeddb12e
commit 40eff17999
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/git-push.txt
View File

@ -52,11 +52,11 @@ updated.
+ +
The object referenced by <src> is used to update the <dst> reference The object referenced by <src> is used to update the <dst> reference
on the remote side. By default this is only allowed if <dst> is not on the remote side. By default this is only allowed if <dst> is not
under refs/tags/, and then only if it can fast-forward <dst>. By having a tag (annotated or lightweight), and then only if it can fast-forward
the optional leading `+`, you can tell git to update the <dst> ref even <dst>. By having the optional leading `+`, you can tell git to update
if it is not allowed by default (e.g., it is not a fast-forward.) This the <dst> ref even if it is not allowed by default (e.g., it is not a
does *not* attempt to merge <src> into <dst>. See EXAMPLES below for fast-forward.) This does *not* attempt to merge <src> into <dst>. See
details. EXAMPLES below for details.
+ +
`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`. `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
+ +

11
remote.c
View File

@ -1281,9 +1281,16 @@ int match_push_refs(struct ref *src, struct ref **dst,
static inline int is_forwardable(struct ref* ref) static inline int is_forwardable(struct ref* ref)
{ {
struct object *o;
if (!prefixcmp(ref->name, "refs/tags/")) if (!prefixcmp(ref->name, "refs/tags/"))
return 0; return 0;
/* old object must be a commit */
o = parse_object(ref->old_sha1);
if (!o || o->type != OBJ_COMMIT)
return 0;
return 1; return 1;
} }
@ -1323,8 +1330,8 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
* to overwrite it; you would not know what you are losing * to overwrite it; you would not know what you are losing
* otherwise. * otherwise.
* *
* (4) if both new and old are commit-ish, and new is a * (4) if old is a commit and new is a descendant of old
* descendant of old, it is OK. * (implying new is commit-ish), it is OK.
* *
* (5) regardless of all of the above, removing :B is * (5) regardless of all of the above, removing :B is
* always allowed. * always allowed.

21
t/t5516-fetch-push.sh
View File

@ -950,6 +950,27 @@ test_expect_success 'push requires --force to update lightweight tag' '
) )
' '
test_expect_success 'push requires --force to update annotated tag' '
mk_test heads/master &&
mk_child child1 &&
mk_child child2 &&
(
cd child1 &&
git tag -a -m "message 1" Tag &&
git push ../child2 Tag:refs/tmp/Tag &&
git push ../child2 Tag:refs/tmp/Tag &&
>file1 &&
git add file1 &&
git commit -m "file1" &&
git tag -f -a -m "message 2" Tag &&
test_must_fail git push ../child2 Tag:refs/tmp/Tag &&
git push --force ../child2 Tag:refs/tmp/Tag &&
git tag -f -a -m "message 3" Tag HEAD~ &&
test_must_fail git push ../child2 Tag:refs/tmp/Tag &&
git push --force ../child2 Tag:refs/tmp/Tag
)
'
test_expect_success 'push --porcelain' ' test_expect_success 'push --porcelain' '
mk_empty && mk_empty &&
echo >.git/foo "To testrepo" && echo >.git/foo "To testrepo" &&