Merge 'build-in git-mktree'

* commit '633e3556ccbc': (5835 commits)
  build-in git-mktree
  allow -t abbreviation for --track in git branch
  gitweb: Remove function prototypes (cleanup)
  Documentation: cloning to empty directory is allowed
  Clarify kind of conflict in merge-one-file helper
  git config: clarify --add and --get-color
  archive-tar.c: squelch a type mismatch warning
  Start 1.6.4 development
  Start 1.6.3.1 maintenance series.
  GIT 1.6.3
  t4029: use sh instead of bash
  t4200: convert sed expression which operates on non-text file to perl
  t4200: remove two unnecessary lines
  t/annotate-tests.sh: avoid passing a non-newline terminated file to sed
  t4118: avoid sed invocation on file without terminating newline
  t4118: add missing '&&'
  t8005: use egrep when extended regular expressions are required
  git-clean doc: the command only affects paths under $(cwd)
  improve error message in config.c
  t4018-diff-funcname: add cpp xfuncname pattern to syntax test
  ...

diff --cc builtin-mktree.c
index 0000000000000000000000000000000000000000,3d054272d5f34e310fa619f183e46ee3a91ede75..9ae7a77890c70ecdd66c2739df7c6d348f6f415c
mode 000000,100644..100644
--- /dev/null
--- 2/builtin-mktree.c
+++ b/builtin-mktree.c
@@@ -1,0 -1,127 +1,128 @@@
+ /*
+  * GIT - the stupid content tracker
+  *
+  * Copyright (c) Junio C Hamano, 2006, 2009
+  */
+ #include "builtin.h"
+ #include "quote.h"
+ #include "tree.h"
+ 
+ static struct treeent {
+       unsigned mode;
+       unsigned char sha1[20];
+       int len;
+       char name[FLEX_ARRAY];
+ } **entries;
+ static int alloc, used;
+ 
+ static void append_to_tree(unsigned mode, unsigned char *sha1, char *path)
+ {
+       struct treeent *ent;
+       int len = strlen(path);
+       if (strchr(path, '/'))
+               die("path %s contains slash", path);
+ 
+       if (alloc <= used) {
+               alloc = alloc_nr(used);
+               entries = xrealloc(entries, sizeof(*entries) * alloc);
+       }
+       ent = entries[used++] = xmalloc(sizeof(**entries) + len + 1);
+       ent->mode = mode;
+       ent->len = len;
+       hashcpy(ent->sha1, sha1);
+       memcpy(ent->name, path, len+1);
+ }
+ 
+ static int ent_compare(const void *a_, const void *b_)
+ {
+       struct treeent *a = *(struct treeent **)a_;
+       struct treeent *b = *(struct treeent **)b_;
+       return base_name_compare(a->name, a->len, a->mode,
+                                b->name, b->len, b->mode);
+ }
+ 
+ static void write_tree(unsigned char *sha1)
+ {
+       struct strbuf buf;
+       size_t size;
+       int i;
+ 
+       qsort(entries, used, sizeof(*entries), ent_compare);
+       for (size = i = 0; i < used; i++)
+               size += 32 + entries[i]->len;
+ 
+       strbuf_init(&buf, size);
+       for (i = 0; i < used; i++) {
+               struct treeent *ent = entries[i];
+               strbuf_addf(&buf, "%o %s%c", ent->mode, ent->name, '\0');
+               strbuf_add(&buf, ent->sha1, 20);
+       }
+ 
+       write_sha1_file(buf.buf, buf.len, tree_type, sha1);
++      strbuf_release(&buf);
+ }
+ 
+ static const char mktree_usage[] = "git mktree [-z]";
+ 
+ int cmd_mktree(int ac, const char **av, const char *prefix)
+ {
+       struct strbuf sb = STRBUF_INIT;
+       struct strbuf p_uq = STRBUF_INIT;
+       unsigned char sha1[20];
+       int line_termination = '\n';
+ 
+       while ((1 < ac) && av[1][0] == '-') {
+               const char *arg = av[1];
+               if (!strcmp("-z", arg))
+                       line_termination = 0;
+               else
+                       usage(mktree_usage);
+               ac--;
+               av++;
+       }
+ 
+       while (strbuf_getline(&sb, stdin, line_termination) != EOF) {
+               char *ptr, *ntr;
+               unsigned mode;
+               enum object_type type;
+               char *path;
+ 
+               ptr = sb.buf;
+               /*
+                * Read non-recursive ls-tree output format:
+                *     mode SP type SP sha1 TAB name
+                */
+               mode = strtoul(ptr, &ntr, 8);
+               if (ptr == ntr || !ntr || *ntr != ' ')
+                       die("input format error: %s", sb.buf);
+               ptr = ntr + 1; /* type */
+               ntr = strchr(ptr, ' ');
+               if (!ntr || sb.buf + sb.len <= ntr + 40 ||
+                   ntr[41] != '\t' ||
+                   get_sha1_hex(ntr + 1, sha1))
+                       die("input format error: %s", sb.buf);
+               type = sha1_object_info(sha1, NULL);
+               if (type < 0)
+                       die("object %s unavailable", sha1_to_hex(sha1));
+               *ntr++ = 0; /* now at the beginning of SHA1 */
+               if (type != type_from_string(ptr))
+                       die("object type %s mismatch (%s)", ptr, typename(type));
+ 
+               path = ntr + 41;  /* at the beginning of name */
+               if (line_termination && path[0] == '"') {
+                       strbuf_reset(&p_uq);
+                       if (unquote_c_style(&p_uq, path, NULL)) {
+                               die("invalid quoting");
+                       }
+                       path = p_uq.buf;
+               }
+ 
+               append_to_tree(mode, sha1, path);
+       }
+       strbuf_release(&p_uq);
+       strbuf_release(&sb);
+ 
+       write_tree(sha1);
+       puts(sha1_to_hex(sha1));
+       exit(0);
+ }