Merge branch 'nh/fetch-http' into next

* nh/fetch-http:
git-fetch: resolve remote symrefs for HTTP transport
commit-tree.c: check_valid() microoptimization.
Fix filename verification when in a subdirectory
rebase: typofix.
socksetup: don't return on set_reuse_addr() error

diff --combined cache.h
index a080727b006a2157570188f1d5fce66b902fc2b8,4d8fabc6d8f3059d12640b66e6cf124c77022d07..00b8804da8f74b6ea23e348adaeb8322f9b00c92
--- 1/cache.h
--- 2/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)