Merge branch 'jn/parse-options-extra'

diff --git a/cache.h b/cache.h
index 909b1f6e9a7c45614522866aa4f20fb41e4628ec..194f784808a4ead9b61f406d2ffe60fe864831bf 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1124,6 +1124,7 @@ const char *split_cmdline_strerror(int cmdline_errno);
 /* git.c */
 struct startup_info {
        int have_repository;
+       const char *prefix;
 };
 extern struct startup_info *startup_info;