summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorDmitry Ivankov <divanorama@gmail.com>2011-09-23 01:47:04 +0600
committerJunio C Hamano <gitster@pobox.com>2011-09-22 13:30:57 -0700
commit2c9c8ee2de3fc6af5a28cbeec15edcf9fe43537c (patch)
treef71091b0ca54833cb26d70187ad9fbbf4463ddef /fast-import.c
parent0dc691a4f3dcb67dd948eb97efcf7098059988c1 (diff)
downloadgit-2c9c8ee2de3fc6af5a28cbeec15edcf9fe43537c.tar.gz
fast-import: don't allow to tag empty branch
'reset' command makes fast-import start a branch from scratch. It's name is kept in lookup table but it's sha1 is null_sha1 (special value). 'tag' command can be used to tag a branch by it's name. lookup_branch() is used it that case and it doesn't check for null_sha1. So fast-import writes a tag for null_sha1 object instead of giving a error. Add a check to deny tagging an empty branch and add a corresponding test. Signed-off-by: Dmitry Ivankov <divanorama@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fast-import.c b/fast-import.c
index 742e7da6b8..c44cc11fd7 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -2717,6 +2717,8 @@ static void parse_new_tag(void)
from = strchr(command_buf.buf, ' ') + 1;
s = lookup_branch(from);
if (s) {
+ if (is_null_sha1(s->sha1))
+ die("Can't tag an empty branch.");
hashcpy(sha1, s->sha1);
type = OBJ_COMMIT;
} else if (*from == ':') {