Merge with http://members.cox.net/junkio/git-jc.git

diff --cc cache.h
index f8329aedfdef678b71d2fa07783b92f9a9aa079e,0901fae8a459c44f4953a98f957723317da6f234..ff229ee523d5228c5c1631e0c0a6b50e5ac9dcb6
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -96,18 -103,18 +103,18 @@@ static inline unsigned int create_ce_mo
  
  #define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7)
  
 -struct cache_entry **active_cache;
 -unsigned int active_nr, active_alloc, active_cache_changed;
 +extern struct cache_entry **active_cache;
 +extern unsigned int active_nr, active_alloc, active_cache_changed;
  
- #define DB_ENVIRONMENT "SHA1_FILE_DIRECTORY"
- #define DEFAULT_DB_ENVIRONMENT ".git/objects"
- 
- #define get_object_directory() (getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT)
- 
+ #define GIT_DIR_ENVIRONMENT "GIT_DIR"
+ #define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
+ #define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY"
  #define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
- #define DEFAULT_INDEX_ENVIRONMENT ".git/index"
  
- #define get_index_file() (getenv(INDEX_ENVIRONMENT) ? : DEFAULT_INDEX_ENVIRONMENT)
+ extern char *get_object_directory(void);
+ extern char *get_index_file(void);
+ 
+ #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
  
  #define alloc_nr(x) (((x)+16)*3/2)
  

diff --cc sha1_file.c
Simple merge

diff --cc write-tree.c
index d801d7fbe9cdec01e410546ce27a76aba98692f0,19b6ee5ea3bf17b81a22c0f76ae5da85998552d3..e3c0a02310a01775741bae0d937333930f14cd3f
--- 1/write-tree.c
--- 2/write-tree.c
+++ b/write-tree.c
@@@ -88,11 -88,11 +88,11 @@@ int main(int argc, char **argv
        int entries = read_cache();
        unsigned char sha1[20];
  
 -      if (entries <= 0)
 -              die("write-tree: no cache contents to write");
 +      if (entries < 0)
 +              die("write-tree: error reading cache");
  
        /* Verify that the tree is merged */
-       unmerged = 0;
+       funny = 0;
        for (i = 0; i < entries; i++) {
                struct cache_entry *ce = active_cache[i];
                if (ntohs(ce->ce_flags) & ~CE_NAMEMASK) {