branch: fix segfault when resolving an invalid HEAD

diff --git a/fast-import.c b/fast-import.c
index bea12151c29af7f4242baaf80e12fd26eb550a45..6c43a0d37f781294a8844ea52c9ce9728396f456 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1193,6 +1193,8 @@ static int tree_content_set(
                n = slash1 - p;
        else
                n = strlen(p);
+       if (!n)
+               die("Empty path component found in input");
 
        for (i = 0; i < t->entry_count; i++) {
                e = t->entries[i];
@@ -1312,7 +1314,7 @@ static int update_branch(struct branch *b)
 
                if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
                        unlock_ref(lock);
-                       warn("Not updating %s"
+                       warning("Not updating %s"
                                " (new tip %s does not contain %s)",
                                b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
                        return -1;