undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fast-import: don't allow to tag empty branch

Browse Source 
'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>
This commit is contained in:
Dmitry Ivankov 2011-09-23 01:47:04 +06:00 committed by Junio C Hamano
parent 0dc691a4f3
commit 2c9c8ee2de
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fast-import.c
View File

@ -2717,6 +2717,8 @@ static void parse_new_tag(void)
from = strchr(command_buf.buf, ' ') + 1; from = strchr(command_buf.buf, ' ') + 1;
s = lookup_branch(from); s = lookup_branch(from);
if (s) { if (s) {
if (is_null_sha1(s->sha1))
die("Can't tag an empty branch.");
hashcpy(sha1, s->sha1); hashcpy(sha1, s->sha1);
type = OBJ_COMMIT; type = OBJ_COMMIT;
} else if (*from == ':') { } else if (*from == ':') {

12
t/t9300-fast-import.sh
View File

@ -820,6 +820,18 @@ test_expect_success \
'test 1 = `git rev-list J | wc -l` && 'test 1 = `git rev-list J | wc -l` &&
test 0 = `git ls-tree J | wc -l`' test 0 = `git ls-tree J | wc -l`'
cat >input <<INPUT_END
reset refs/heads/J2
tag wrong_tag
from refs/heads/J2
data <<EOF
Tag branch that was reset.
EOF
INPUT_END
test_expect_success \
'J: tag must fail on empty branch' \
'test_must_fail git fast-import <input'
### ###
### series K ### series K
### ###