summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-31 16:23:31 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-31 16:23:31 -0700
commit633142d86874ee8ce79a23ee4346f32e6271faad (patch)
tree8096e26f84075d3aae42d13fe0b76c2a5f2ea07c /cache.h
parent693fefe3d022767975eec7585561bfe178b873f4 (diff)
parent41bf3bc232cf5f99fdc6d3d729536a4c4821d3bd (diff)
downloadgit-633142d86874ee8ce79a23ee4346f32e6271faad.tar.gz
Merge branch 'jn/paginate-fix'
* jn/paginate-fix: t7006 (pager): add missing TTY prerequisites merge-file: run setup_git_directory_gently() sooner var: run setup_git_directory_gently() sooner ls-remote: run setup_git_directory_gently() sooner index-pack: run setup_git_directory_gently() sooner config: run setup_git_directory_gently() sooner bundle: run setup_git_directory_gently() sooner apply: run setup_git_directory_gently() sooner grep: run setup_git_directory_gently() sooner shortlog: run setup_git_directory_gently() sooner git wrapper: allow setup_git_directory_gently() be called earlier setup: remember whether repository was found git wrapper: introduce startup_info struct Conflicts: builtin/index-pack.c
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index eb77e1df48..733d4d1c81 100644
--- a/cache.h
+++ b/cache.h
@@ -1102,6 +1102,12 @@ int split_cmdline(char *cmdline, const char ***argv);
/* Takes a negative value returned by split_cmdline */
const char *split_cmdline_strerror(int cmdline_errno);
+/* git.c */
+struct startup_info {
+ int have_repository;
+};
+extern struct startup_info *startup_info;
+
/* builtin/merge.c */
int checkout_fast_forward(const unsigned char *from, const unsigned char *to);