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>
This commit is contained in:

committed by
Junio C Hamano

parent
0dc691a4f3
commit
2c9c8ee2de
@ -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 <<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
|
||||
###
|
||||
|
Reference in New Issue
Block a user