From: Petr Baudis <pasky@ucw.cz>
Date: Wed, 11 May 2005 00:00:49 +0000 (+0200)
Subject: Merge with http://members.cox.net/junkio/git-jc.git
X-Git-Tag: v0.99~603
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1a7eb36b017c62d9a007b6b8660bdeec3f94f97;p=git.git

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

f1a7eb36b017c62d9a007b6b8660bdeec3f94f97
diff --cc cache.h
index f8329aedf,0901fae8a..ff229ee52
--- a/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 write-tree.c
index d801d7fbe,19b6ee5ea..e3c0a0231
--- a/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) {