From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Aug 2009 21:47:56 +0000 (-0700)
Subject: Merge branch 'jc/maint-checkout-index-to-prefix'
X-Git-Tag: v1.6.5-rc0~41
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3613339eaf3638f7a22ee55f914308f8bab5f2cf?ds=inline;hp=-c

Merge branch 'jc/maint-checkout-index-to-prefix'

* jc/maint-checkout-index-to-prefix:
check_path(): allow symlinked directories to checkout-index --prefix
---

3613339eaf3638f7a22ee55f914308f8bab5f2cf
diff --combined cache.h
index f793789377,2c2f05c3e0..dd7f71eba5
--- a/cache.h
+++ b/cache.h
@@@ -469,7 -469,7 +469,7 @@@ extern int index_path(unsigned char *sh
  extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
  
  /* "careful lstat()" */
- extern int check_path(const char *path, int len, struct stat *st);
+ extern int check_path(const char *path, int len, struct stat *st, int skiplen);
  
  #define REFRESH_REALLY		0x0001	/* ignore_valid */
  #define REFRESH_UNMERGED	0x0002	/* allow unmerged */
@@@ -512,7 -512,6 +512,7 @@@ extern int log_all_ref_updates
  extern int warn_ambiguous_refs;
  extern int shared_repository;
  extern const char *apply_default_whitespace;
 +extern const char *apply_default_ignorewhitespace;
  extern int zlib_compression_level;
  extern int core_compression_level;
  extern int core_compression_seen;
@@@ -520,7 -519,6 +520,7 @@@ extern size_t packed_git_window_size
  extern size_t packed_git_limit;
  extern size_t delta_base_cache_limit;
  extern int auto_crlf;
 +extern int read_replace_refs;
  extern int fsync_object_files;
  extern int core_preload_index;
  
@@@ -657,11 -655,7 +657,11 @@@ char *strip_path_suffix(const char *pat
  
  /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
  extern int sha1_object_info(const unsigned char *, unsigned long *);
 -extern void * read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size);
 +extern void *read_sha1_file_repl(const unsigned char *sha1, enum object_type *type, unsigned long *size, const unsigned char **replacement);
 +static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size)
 +{
 +	return read_sha1_file_repl(sha1, type, size, NULL);
 +}
  extern int hash_sha1_file(const 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 int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);