From: Junio C Hamano <junkio@cox.net>
Date: Sun, 18 Jun 2006 00:08:36 +0000 (-0700)
Subject: Merge branch 'js/diff'
X-Git-Tag: v1.4.1-rc1~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc5201ac9f17abf8b70b248b17595f3f3d35c056;p=git.git

Merge branch 'js/diff'
---

fc5201ac9f17abf8b70b248b17595f3f3d35c056
diff --cc cache.h
index 1b8e053f2,f630cf4bf..7fcb6d406
--- a/cache.h
+++ b/cache.h
@@@ -208,15 -208,9 +208,15 @@@ extern const unsigned char null_sha1[20
  
  int git_mkstemp(char *path, size_t n, const char *template);
  
 +enum sharedrepo {
 +	PERM_UMASK = 0,
 +	PERM_GROUP,
 +	PERM_EVERYBODY
 +};
 +int git_config_perm(const char *var, const char *value);
  int adjust_shared_perm(const char *path);
  int safe_create_leading_directories(char *path);
- char *safe_strncpy(char *, const char *, size_t);
+ size_t safe_strncpy(char *, const char *, size_t);
  char *enter_repo(char *path, int strict);
  
  /* Read and unpack a sha1 file into memory, write memory to a sha1 file */