From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Sep 2012 17:53:21 +0000 (-0700)
Subject: Merge branch 'nd/index-errno' into maint-1.7.11
X-Git-Tag: v1.7.11.6~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8ce800531d0c5c26cdc076fe2b9e70d25fe7f81;p=thirdparty%2Fgit.git

Merge branch 'nd/index-errno' into maint-1.7.11

* nd/index-errno:
  read_index_from: remove bogus errno assignments
---

d8ce800531d0c5c26cdc076fe2b9e70d25fe7f81
diff --cc read-cache.c
index 7d4bf68e33,5a78d6b05f..d8543e4d42
--- a/read-cache.c
+++ b/read-cache.c
@@@ -1407,9 -1273,7 +1407,8 @@@ int read_index_from(struct index_state 
  	struct cache_header *hdr;
  	void *mmap;
  	size_t mmap_size;
 +	struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
  
- 	errno = EBUSY;
  	if (istate->initialized)
  		return istate->cache_nr;