builtin/apply: avoid parameter shadowing 'linenr' global

diff --git a/sha1_name.c b/sha1_name.c
index 1ae20fec15bed85e5e09a76cf5376ed436977313..ca7ddd6f2cf7074a1d74e011c2bd260c2ae6ffe6 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -1362,9 +1362,6 @@ static char *resolve_relative_path(const char *rel)
        if (!starts_with(rel, "./") && !starts_with(rel, "../"))
                return NULL;
 
-       if (!startup_info)
-               die("BUG: startup_info struct is not initialized.");
-
        if (!is_inside_work_tree())
                die("relative path syntax can't be used outside working tree.");