From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Dec 2011 06:18:00 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.9-rc0~74
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9e6324c4d784c36d2558ccdea7c8470ac2701437;p=git.git

Merge branch 'maint'

* maint:
  Update draft release notes for 1.7.8.1
  Git 1.7.7.5
  Git 1.7.6.5
  blame: don't overflow time buffer
  fetch: create status table using strbuf

Conflicts:
	RelNotes
---

9e6324c4d784c36d2558ccdea7c8470ac2701437
diff --cc builtin/fetch.c
index 494a7f997,8761a33b4..33ad3aad2
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -427,18 -436,17 +436,16 @@@ static int store_updated_refs(const cha
  		if (4 < i && !strncmp(".git", url + i - 3, 4))
  			url_len = i - 3;
  
- 		note_len = 0;
+ 		strbuf_reset(&note);
  		if (*what) {
  			if (*kind)
- 				note_len += sprintf(note + note_len, "%s ",
- 						    kind);
- 			note_len += sprintf(note + note_len, "'%s' of ", what);
+ 				strbuf_addf(&note, "%s ", kind);
+ 			strbuf_addf(&note, "'%s' of ", what);
  		}
- 		note[note_len] = '\0';
  		fprintf(fp, "%s\t%s\t%s",
 -			sha1_to_hex(commit ? commit->object.sha1 :
 -				    rm->old_sha1),
 +			sha1_to_hex(rm->old_sha1),
  			rm->merge ? "" : "not-for-merge",
- 			note);
+ 			note.buf);
  		for (i = 0; i < url_len; ++i)
  			if ('\n' == url[i])
  				fputs("\\n", fp);