summaryrefslogtreecommitdiff
path: root/builtin/tag.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-27 21:57:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-02-27 21:57:18 (GMT)
commitc13c783c9d3d7d3eff937b7bf3642d2a7fe32644 (patch)
treec650be76225f1b73aa5df51bcba519c532ebf437 /builtin/tag.c
parent3f7ebc6ece46f1c23480d094688b8b5f24eb345c (diff)
parent39ee4c6c2fc80960094ae1454922c2d10c72f210 (diff)
downloadgit-c13c783c9d3d7d3eff937b7bf3642d2a7fe32644.zip
git-c13c783c9d3d7d3eff937b7bf3642d2a7fe32644.tar.gz
git-c13c783c9d3d7d3eff937b7bf3642d2a7fe32644.tar.bz2
Merge branch 'km/delete-ref-reflog-message'
"git update-ref -d" and other operations to delete references did not leave any entry in HEAD's reflog when the reference being deleted was the current branch. This is not a problem in practice because you do not want to delete the branch you are currently on, but caused renaming of the current branch to something else not to be logged in a useful way. * km/delete-ref-reflog-message: branch: record creation of renamed branch in HEAD's log rename_ref: replace empty message in HEAD's log update-ref: pass reflog message to delete_ref() delete_ref: accept a reflog message argument
Diffstat (limited to 'builtin/tag.c')
-rw-r--r--builtin/tag.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/tag.c b/builtin/tag.c
index e5e2c6a..ad29be6 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -97,7 +97,7 @@ static int for_each_tag_name(const char **argv, each_tag_name_fn fn,
static int delete_tag(const char *name, const char *ref,
const unsigned char *sha1, const void *cb_data)
{
- if (delete_ref(ref, sha1, 0))
+ if (delete_ref(NULL, ref, sha1, 0))
return 1;
printf(_("Deleted tag '%s' (was %s)\n"), name, find_unique_abbrev(sha1, DEFAULT_ABBREV));
return 0;