Merge branch 'master' into next

* master:
  clone: the given repository dir should be relative to $PWD
  cvsserver: fix "cvs diff" in a subdirectory
  cvsserver: Show correct letters for modified, removed and added files
  git-svn: reduce memory usage for large commits
  Fix tracing when GIT_TRACE is set to an empty string.
  Make write_sha1_file_prepare() static
  Add hash_sha1_file()
  git-svn: fix commits over svn+ssh://
This commit is contained in:
Junio C Hamano
2006-10-14 18:25:47 -07:00
10 changed files with 92 additions and 65 deletions

View File

@@ -246,13 +246,8 @@ char *enter_repo(char *path, int strict);
extern int sha1_object_info(const unsigned char *, char *, unsigned long *);
extern void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned long *size);
extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size);
extern int hash_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *sha1);
extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
extern char *write_sha1_file_prepare(void *buf,
unsigned long len,
const char *type,
unsigned char *sha1,
unsigned char *hdr,
int *hdrlen);
extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);