diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-07 15:38:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-07 15:38:50 -0800 |
| commit | 0ad6f1a988312ebc2733126cf17f694d7008659f (patch) | |
| tree | 56e88bd2ad8499c90c8248a9a2d94c00d30e4366 | |
| parent | Merge branch 'so/cvsserver-update' (diff) | |
| parent | tag -d: print sha1 of deleted tag (diff) | |
| download | tgif-0ad6f1a988312ebc2733126cf17f694d7008659f.tar.xz | |
Merge branch 'mg/tag-d-show'
* mg/tag-d-show:
tag -d: print sha1 of deleted tag
| -rw-r--r-- | builtin-tag.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-tag.c b/builtin-tag.c index c4790185eb..4ef1c4f508 100644 --- a/builtin-tag.c +++ b/builtin-tag.c @@ -140,7 +140,7 @@ static int delete_tag(const char *name, const char *ref, { if (delete_ref(ref, sha1, 0)) return 1; - printf("Deleted tag '%s'\n", name); + printf("Deleted tag '%s' (was %s)\n", name, find_unique_abbrev(sha1, DEFAULT_ABBREV)); return 0; } @@ -479,6 +479,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix) die("%s: cannot lock the ref", ref); if (write_ref_sha1(lock, object, NULL) < 0) die("%s: cannot update the ref", ref); + if (force && hashcmp(prev, object)) + printf("Updated tag '%s' (was %s)\n", tag, find_unique_abbrev(prev, DEFAULT_ABBREV)); strbuf_release(&buf); return 0; |