From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Nov 2008 07:15:22 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~103
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aebd173ffa7a4e67447f0157a14abde7767c54e9;p=git.git

Merge branch 'maint'

* maint:
  Start 1.6.0.4 cycle
  add instructions on how to send patches to the mailing list with Gmail
  Documentation/gitattributes: Add subsection header for each attribute
  git send-email: avoid leaking directory file descriptors.
  send-pack: do not send out single-level refs such as refs/stash
  fix overlapping memcpy in normalize_absolute_path
  pack-objects: avoid reading uninitalized data
  correct cache_entry allocation

Conflicts:
	RelNotes
---

aebd173ffa7a4e67447f0157a14abde7767c54e9
diff --cc builtin-pack-objects.c
index 59c30d1ca,b0dddbee4..15b80db5a
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@@ -1372,10 -1372,12 +1372,10 @@@ static void find_deltas(struct object_e
  	struct unpacked *array;
  	unsigned long mem_usage = 0;
  
 -	array = xmalloc(array_size);
 -	memset(array, 0, array_size);
 +	array = xcalloc(window, sizeof(struct unpacked));
  
  	for (;;) {
- 		struct object_entry *entry = *list++;
+ 		struct object_entry *entry;
  		struct unpacked *n = array + idx;
  		int j, max_depth, best_base = -1;