From 2c9c8ee2de3fc6af5a28cbeec15edcf9fe43537c Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Fri, 23 Sep 2011 01:47:04 +0600 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- fast-import.c | 2 ++ t/t9300-fast-import.sh | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/fast-import.c b/fast-import.c index 742e7da6b..c44cc11fd 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 == ':') { diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 1a6c06631..0b97d7aab 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -820,6 +820,18 @@ test_expect_success \ 'test 1 = `git rev-list J | wc -l` && test 0 = `git ls-tree J | wc -l`' +cat >input <