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>
Dmitry Ivankov committed
Sep 23, 2011 at 01:47 UTC
2c9c8ee2de3fc6af5a28cbeec15edcf9fe43537c
2 files changed
+14
fast-import.c
+2
@@ -2717,6 +2717,8 @@ static void parse_new_tag(void)
2717
from = strchr(command_buf.buf, ' ') + 1;
2718
s = lookup_branch(from);
2719
if (s) {
2720
+ if (is_null_sha1(s->sha1))
2721
+ die("Can't tag an empty branch.");
2722
hashcpy(sha1, s->sha1);
2723
type = OBJ_COMMIT;
2724
} else if (*from == ':') {
t/t9300-fast-import.sh
+12
@@ -820,6 +820,18 @@ test_expect_success \
820
'test 1 = `git rev-list J | wc -l` &&
821
test 0 = `git ls-tree J | wc -l`'
822
823
+cat >input <<INPUT_END
824
+reset refs/heads/J2
825
+
826
+tag wrong_tag
827
+from refs/heads/J2
828
+data <<EOF
829
+Tag branch that was reset.
830
+EOF
831
+INPUT_END
832
+test_expect_success \
833
+ 'J: tag must fail on empty branch' \
834
+ 'test_must_fail git fast-import <input'
835
###
836
### series K
837
###