diff options
author | Junio C Hamano <junkio@cox.net> | 2007-05-28 23:54:26 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-05-28 23:54:26 -0700 |
commit | cdd5b82ee8e6941eee9c7b09df63c44789fd5c4b (patch) | |
tree | cded11d5f1df83bad67218e61cfb71596567b214 /tag.c | |
parent | c63a3ad2c1d6f86cd7989055a133e06055239317 (diff) | |
parent | 7faf068660f0a060066ccbc80f7debbba6bc2d76 (diff) | |
download | git-cdd5b82ee8e6941eee9c7b09df63c44789fd5c4b.tar.gz |
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1:
git-svn: avoid md5 calculation entirely if SVN doesn't provide one
Fix stupid typo in lookup_tag()
Diffstat (limited to 'tag.c')
-rw-r--r-- | tag.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ struct tag *lookup_tag(const unsigned char *sha1) if (!obj->type) obj->type = OBJ_TAG; if (obj->type != OBJ_TAG) { - error("Object %s is a %s, not a tree", + error("Object %s is a %s, not a tag", sha1_to_hex(sha1), typename(obj->type)); return NULL; } |