summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorDmitry Ivankov <divanorama@gmail.com>2011-09-23 01:47:05 +0600
committerJunio C Hamano <gitster@pobox.com>2011-09-22 13:30:59 -0700
commit0bc69881a611c582f3b89a475882161d83c56494 (patch)
treeaceec5dfeddcc08f6cde658da692f45e3ca1d0dd /fast-import.c
parent2c9c8ee2de3fc6af5a28cbeec15edcf9fe43537c (diff)
downloadgit-0bc69881a611c582f3b89a475882161d83c56494.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>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c2
1 files changed, 2 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);