Merge branch 'js/diff'

diff --cc cache.h
index 1b8e053f2850c9f70089ad0eebc8d12518f1fc39,f630cf4bfa92e45600a83d2c3bac05a855deb847..7fcb6d406aa258315f6f2bbba128baee60f59838
--- 1/cache.h
--- 2/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 */

diff --cc path.c
Simple merge