From: Junio C Hamano <junkio@cox.net>
Date: Thu, 27 Apr 2006 19:51:08 +0000 (-0700)
Subject: Merge branch 'jc/pathcheck' into next
X-Git-Tag: v1.4.1-rc1~171
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c9a11205f73d7d39aab8b70169d73948d4a9f04f?hp=-c

Merge branch 'jc/pathcheck' into next

* jc/pathcheck:
revision parsing: make "rev -- paths" checks stronger.
---

c9a11205f73d7d39aab8b70169d73948d4a9f04f
diff --combined cache.h
index 00b8804da8,a4f253ec25..b3e8de4270
--- 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"
@@@ -136,6 -135,7 +136,7 @@@ extern const char *setup_git_directory(
  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);
+ extern void verify_non_filename(const char *prefix, const char *name);
  
  #define alloc_nr(x) (((x)+16)*3/2)