From: Junio C Hamano <junkio@cox.net>
Date: Thu, 27 Apr 2006 01:32:45 +0000 (-0700)
Subject: Merge branch 'master' into jc/cache-tree
X-Git-Tag: v1.4.1-rc1~176^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e7afa1115beb071512ac2b8d6b7487eadbfccc74?ds=inline;hp=-c

Merge branch 'master' into jc/cache-tree

* master:
t0000-basic: more commit-tree tests.
commit-tree.c: check_valid() microoptimization.
Fix filename verification when in a subdirectory
rebase: typofix.
socksetup: don't return on set_reuse_addr() error
---

e7afa1115beb071512ac2b8d6b7487eadbfccc74
diff --combined cache.h
index a080727b00,4d8fabc6d8..00b8804da8
--- a/cache.h
+++ b/cache.h
@@@ -114,7 -114,6 +114,7 @@@ static inline unsigned int create_ce_mo
  
  extern struct cache_entry **active_cache;
  extern unsigned int active_nr, active_alloc, active_cache_changed;
 +extern struct cache_tree *active_cache_tree;
  
  #define GIT_DIR_ENVIRONMENT "GIT_DIR"
  #define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
@@@ -135,6 -134,7 +135,7 @@@ extern const char *setup_git_directory_
  extern const char *setup_git_directory(void);
  extern const char *prefix_path(const char *prefix, int len, const char *path);
  extern const char *prefix_filename(const char *prefix, int len, const char *path);
+ extern void verify_filename(const char *prefix, const char *name);
  
  #define alloc_nr(x) (((x)+16)*3/2)