Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Fix bogus error message from merge-recursive error path
[gitweb.git]
/
cache.h
diff --git
a/cache.h
b/cache.h
index 1f128d55d206e59ed42e04244a3a77728bae8593..467e6a579aa4ef1de9df8e76cb09afa6abfe1646 100644
(file)
--- a/
cache.h
+++ b/
cache.h
@@
-128,7
+128,6
@@
static inline unsigned int ce_mode_from_stat(struct cache_entry *ce, unsigned in
extern struct cache_entry **active_cache;
extern unsigned int active_nr, active_alloc, active_cache_changed;
extern struct cache_tree *active_cache_tree;
-extern int cache_errno;
enum object_type {
OBJ_BAD = -1,