diff options
| author | Dmitry Ivankov <divanorama@gmail.com> | 2011-09-23 01:47:05 +0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-22 13:30:59 -0700 |
| commit | 0bc69881a611c582f3b89a475882161d83c56494 (patch) | |
| tree | aceec5dfeddcc08f6cde658da692f45e3ca1d0dd | |
| parent | 2c9c8ee2de3fc6af5a28cbeec15edcf9fe43537c (diff) | |
| download | git-di/fast-import-empty-tag-note-fix.tar.gz | |
fast-import: don't allow to note on empty branchdi/fast-import-empty-tag-note-fix
'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 <divanorama@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | fast-import.c | 2 | ||||
| -rwxr-xr-x | t/t9300-fast-import.sh | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/fast-import.c b/fast-import.c index c44cc11fd7..a8a3ad1124 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) /* <committish> */ 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 0b97d7aab9..bd32b91d8f 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 <<EOF +reset refs/heads/Q0 + +commit refs/heads/note-Q0 +committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE +data <<COMMIT +Note for an empty branch. +COMMIT + +N inline refs/heads/Q0 +data <<NOTE +some note +NOTE +EOF +test_expect_success \ + 'Q: deny note on empty branch' \ + 'test_must_fail git fast-import <input' ### ### series R (feature and option) ### |