From 0bc69881a611c582f3b89a475882161d83c56494 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Fri, 23 Sep 2011 01:47:05 +0600 Subject: [PATCH] fast-import: don't allow to note on 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). 'notemodify' command can be used to add a note on branch head given it's name. lookup_branch() is used it that case and it doesn't check for null_sha1. So fast-import writes a note for null_sha1 object instead of giving a error. Add a check to deny adding a note on 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 | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/fast-import.c b/fast-import.c index c44cc11fd..a8a3ad112 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2416,6 +2416,8 @@ static void note_change_n(struct branch *b, unsigned char old_fanout) /* */ s = lookup_branch(p); if (s) { + if (is_null_sha1(s->sha1)) + die("Can't add a note on empty branch."); hashcpy(commit_sha1, s->sha1); } else if (*p == ':') { uintmax_t commit_mark = strtoumax(p + 1, NULL, 10); diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 0b97d7aab..bd32b91d8 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1987,6 +1987,23 @@ test_expect_success \ 'Q: verify second note for second commit' \ 'git cat-file blob refs/notes/foobar:$commit2 >actual && test_cmp expect actual' +cat >input < $GIT_COMMITTER_DATE +data <