Merge branch 'master' into next

* master:
  fsck-objects: refactor checking for connectivity
  git-gc: do not run git-prune by default.
  shallow repository: disable unsupported operations for now.
  is_repository_shallow(): prototype fix.
  Make sure git_connect() always give two file descriptors.
  Revert "prune: --grace=time"
  Documentation/tutorial-2: Fix interesting typo in an example.
This commit is contained in:
Junio C Hamano
2007-01-22 00:12:22 -08:00
16 changed files with 150 additions and 95 deletions

View File

@@ -110,7 +110,7 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *r
extern int register_shallow(const unsigned char *sha1);
extern int unregister_shallow(const unsigned char *sha1);
extern int write_shallow_commits(int fd, int use_pack_protocol);
extern int is_repository_shallow();
extern int is_repository_shallow(void);
extern struct commit_list *get_shallow_commits(struct object_array *heads,
int depth, int shallow_flag, int not_shallow_flag);