Browse Source

Merge branch 'ph/tag-force-no-warn-on-creation'

"git tag -f <tag>" always said "Updated tag '<tag>'" even when
creating a new tag (i.e. not overwriting nor updating).

* ph/tag-force-no-warn-on-creation:
  tag: --force does not have to warn when creating tags
maint
Junio C Hamano 12 years ago
parent
commit
33c1506d62
  1. 2
      builtin/tag.c
  2. 12
      t/t7004-tag.sh

2
builtin/tag.c

@ -582,7 +582,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) @@ -582,7 +582,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
die(_("%s: cannot lock the ref"), ref.buf);
if (write_ref_sha1(lock, object, NULL) < 0)
die(_("%s: cannot update the ref"), ref.buf);
if (force && hashcmp(prev, object))
if (force && !is_null_sha1(prev) && hashcmp(prev, object))
printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev, DEFAULT_ABBREV));

strbuf_release(&buf);

12
t/t7004-tag.sh

@ -104,6 +104,18 @@ test_expect_success 'creating a tag using HEAD directly should succeed' ' @@ -104,6 +104,18 @@ test_expect_success 'creating a tag using HEAD directly should succeed' '
tag_exists myhead
'

test_expect_success '--force can create a tag with the name of one existing' '
tag_exists mytag &&
git tag --force mytag &&
tag_exists mytag'

test_expect_success '--force is moot with a non-existing tag name' '
git tag newtag >expect &&
git tag --force forcetag >actual &&
test_cmp expect actual
'
git tag -d newtag forcetag

# deleting tags:

test_expect_success 'trying to delete an unknown tag should fail' '

Loading…
Cancel
Save