From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Jan 2010 05:29:47 +0000 (-0800)
Subject: Merge branch 'maint-1.6.2' into maint-1.6.3
X-Git-Tag: v1.6.5.8~5^2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=011c181cc656c8b3e48882729d1b6238e8c5c537;p=git.git

Merge branch 'maint-1.6.2' into maint-1.6.3

* maint-1.6.2:
  base85: Make the code more obvious instead of explaining the non-obvious
  base85: encode_85() does not use the decode table
  base85 debug code: Fix length byte calculation
  checkout -m: do not try to fall back to --merge from an unborn branch
  branch: die explicitly why when calling "git branch [-a|-r] branchname".
  textconv: stop leaking file descriptors
  commit: --cleanup is a message option
  git count-objects: handle packs bigger than 4G
  t7102: make the test fail if one of its check fails

Conflicts:
	diff.c
---

011c181cc656c8b3e48882729d1b6238e8c5c537
diff --cc diff.c
index f0b580c15,9ec576770..ad5c0a20e
--- a/diff.c
+++ b/diff.c
@@@ -3590,7 -3586,7 +3590,8 @@@ static char *run_textconv(const char *p
  	if (start_command(&child) != 0 ||
  	    strbuf_read(&buf, child.out, 0) < 0 ||
  	    finish_command(&child) != 0) {
+ 		close(child.out);
 +		strbuf_release(&buf);
  		remove_tempfile();
  		error("error running textconv command '%s'", pgm);
  		return NULL;