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

Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1:
  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
---

c5034673fd92b6278e6c9d55683770ec01fafc89
diff --cc diff.c
index 4f980aded,69147b802..9ec576770
--- a/diff.c
+++ b/diff.c
@@@ -3586,11 -3485,15 +3586,13 @@@ 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);
 -		if (temp.name == temp.tmp_path)
 -			unlink(temp.name);
 +		remove_tempfile();
  		error("error running textconv command '%s'", pgm);
  		return NULL;
  	}
+ 	close(child.out);
 -	if (temp.name == temp.tmp_path)
 -		unlink(temp.name);
 +	remove_tempfile();
  
  	return strbuf_detach(&buf, outsize);
  }