diff options
| author |  Phil Hord <hordp@cisco.com> | 2013-03-12 19:13:41 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-03-13 10:35:15 -0700 |
| commit | 3ae851e6fbb4e99fa7281d18a5c6f95a3fb6d998 (patch) | |
| tree | 8d9a4a19d6916b1b6c9f9e5484f1d7851ecc8c7f | |
| parent | git.c: make usage match manual page (diff) | |
| download | tgif-3ae851e6fbb4e99fa7281d18a5c6f95a3fb6d998.tar.xz | |
tag: --force does not have to warn when creating tags
"git tag --force" mentions what old tag object is being replaced
when it is used to update an existing tag, but it shows the same
message when creating a new one. Stop doing that, as it does not
add any information.
Add a test for this and also to ensure --force can replace tags at
all.
Signed-off-by: Phil Hord <hordp@cisco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/tag.c | 2 | ||||
| -rwxr-xr-x | t/t7004-tag.sh | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index 9c3e0673d5..d4824800b7 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -584,7 +584,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); diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index f5a79b13ae..c8d6e9f88c 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -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' ' |