Merge branch 'maint-1.6.1' into maint-1.6.2
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Jan 2010 08:49:47 +0000 (00:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Jan 2010 08:49:47 +0000 (00:49 -0800)
* 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

1  2 
builtin-branch.c
builtin-checkout.c
builtin-commit.c
builtin-count-objects.c
diff.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc diff.c
--- 1/diff.c
--- 2/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) {
 -              if (temp.name == temp.tmp_path)
 -                      unlink(temp.name);
+               close(child.out);
 +              remove_tempfile();
                error("error running textconv command '%s'", pgm);
                return NULL;
        }
 -      if (temp.name == temp.tmp_path)
 -              unlink(temp.name);
+       close(child.out);
 +      remove_tempfile();
  
        return strbuf_detach(&buf, outsize);
  }