Merge branch 'lt/refs' into jc/lt-ref2-with-lt-refs

* lt/refs: (58 commits)
  git-pack-refs --prune
  pack-refs: do not pack symbolic refs.
  Tell between packed, unpacked and symbolic refs.
  Add callback data to for_each_ref() family.
  symbolit-ref: fix resolve_ref conversion.
  Fix broken sha1 locking
  fsck-objects: adjust to resolve_ref() clean-up.
  gitignore: git-pack-refs is a generated file.
  wt-status: use simplified resolve_ref to find current branch
  Fix t1400-update-ref test minimally
  Enable the packed refs file format
  Make ref resolution saner
  Add support for negative refs
  Start handling references internally as a sorted in-memory list
  gitweb fix validating pg (page) parameter
  git-repack(1): document --window and --depth
  git-apply(1): document --unidiff-zero
  gitweb: fix warnings in PATH_INFO code and add export_ok/strict_export
  upload-archive: monitor child communication even more carefully.
  gitweb: export options
  ...

diff --cc .gitignore
Simple merge

diff --cc Makefile
index c3651384c252a82da02af0aba7f5b61450e8751c,cdbb566d4ed137d62780309c7ff26f8a5022d3d0..563b921d924ad66ba9e551105acd2a7e77059fb6
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -296,7 -302,7 +302,8 @@@ BUILTIN_OBJS = 
        builtin-verify-pack.o \
        builtin-write-tree.o \
        builtin-zip-tree.o \
-       builtin-show-ref.o
++      builtin-show-ref.o \
+       builtin-pack-refs.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz

diff --cc builtin-show-ref.c
index fab359bb42b9fb2b9ec1749a7772f14206cf5418,0000000000000000000000000000000000000000..12c457c3c1acb888d4b3442d11db0f8b414c2d82
mode 100644,000000..100644
--- 1/builtin-show-ref.c
--- /dev/null
+++ b/builtin-show-ref.c
@@@ -1,120 -1,0 +1,120 @@@
- static int show_ref(const char *refname, const unsigned char *sha1)
 +#include "cache.h"
 +#include "refs.h"
 +#include "object.h"
 +#include "tag.h"
 +
 +static const char show_ref_usage[] = "git show-ref [-q|--quiet] [--verify] [-h|--head] [-d|--dereference] [-s|--hash] [--tags] [--heads] [--] [pattern*]";
 +
 +static int deref_tags = 0, show_head = 0, tags_only = 0, heads_only = 0,
 +      found_match = 0, verify = 0, quiet = 0, hash_only = 0;
 +static const char **pattern;
 +
-               head_ref(show_ref);
-       for_each_ref(show_ref);
++static int show_ref(const char *refname, const unsigned char *sha1, int flag, void *cbdata)
 +{
 +      struct object *obj;
 +
 +      if (tags_only || heads_only) {
 +              int match;
 +
 +              match = heads_only && !strncmp(refname, "refs/heads/", 11);
 +              match |= tags_only && !strncmp(refname, "refs/tags/", 10);
 +              if (!match)
 +                      return 0;
 +      }
 +      if (pattern) {
 +              int reflen = strlen(refname);
 +              const char **p = pattern, *m;
 +              while ((m = *p++) != NULL) {
 +                      int len = strlen(m);
 +                      if (len > reflen)
 +                              continue;
 +                      if (memcmp(m, refname + reflen - len, len))
 +                              continue;
 +                      if (len == reflen)
 +                              goto match;
 +                      /* "--verify" requires an exact match */
 +                      if (verify)
 +                              continue;
 +                      if (refname[reflen - len - 1] == '/')
 +                              goto match;
 +              }
 +              return 0;
 +      }
 +
 +match:
 +      found_match++;
 +      obj = parse_object(sha1);
 +      if (!obj) {
 +              if (quiet)
 +                      return 0;
 +              die("git-show-ref: bad ref %s (%s)", refname, sha1_to_hex(sha1));
 +      }
 +      if (quiet)
 +              return 0;
 +      if (hash_only)
 +              printf("%s\n", sha1_to_hex(sha1));
 +      else
 +              printf("%s %s\n", sha1_to_hex(sha1), refname);
 +      if (deref_tags && obj->type == OBJ_TAG) {
 +              obj = deref_tag(obj, refname, 0);
 +              printf("%s %s^{}\n", sha1_to_hex(obj->sha1), refname);
 +      }
 +      return 0;
 +}
 +
 +int cmd_show_ref(int argc, const char **argv, const char *prefix)
 +{
 +      int i;
 +
 +      for (i = 1; i < argc; i++) {
 +              const char *arg = argv[i];
 +              if (*arg != '-') {
 +                      pattern = argv + i;
 +                      break;
 +              }
 +              if (!strcmp(arg, "--")) {
 +                      pattern = argv + i + 1;
 +                      if (!*pattern)
 +                              pattern = NULL;
 +                      break;
 +              }
 +              if (!strcmp(arg, "-q") || !strcmp(arg, "--quiet")) {
 +                      quiet = 1;
 +                      continue;
 +              }
 +              if (!strcmp(arg, "-h") || !strcmp(arg, "--head")) {
 +                      show_head = 1;
 +                      continue;
 +              }
 +              if (!strcmp(arg, "-d") || !strcmp(arg, "--dereference")) {
 +                      deref_tags = 1;
 +                      continue;
 +              }
 +              if (!strcmp(arg, "-s") || !strcmp(arg, "--hash")) {
 +                      hash_only = 1;
 +                      continue;
 +              }
 +              if (!strcmp(arg, "--verify")) {
 +                      verify = 1;
 +                      continue;
 +              }
 +              if (!strcmp(arg, "--tags")) {
 +                      tags_only = 1;
 +                      continue;
 +              }
 +              if (!strcmp(arg, "--heads")) {
 +                      heads_only = 1;
 +                      continue;
 +              }
 +              usage(show_ref_usage);
 +      }
 +      if (show_head)
++              head_ref(show_ref, NULL);
++      for_each_ref(show_ref, NULL);
 +      if (!found_match) {
 +              if (verify && !quiet)
 +                      die("No match");
 +              return 1;
 +      }
 +      return 0;
 +}

diff --cc builtin.h
index a7242beebbb6b2e95acd4ab34e4ea5632c4b3e88,4b11f52f1d083483c9a09201250e15cd0a0c6557..37c2e4ac43a1ee6bd38583fa2599e7aa836ab266
--- 1/builtin.h
--- 2/builtin.h
+++ b/builtin.h
@@@ -60,6 -63,6 +63,7 @@@ extern int cmd_version(int argc, const 
  extern int cmd_whatchanged(int argc, const char **argv, const char *prefix);
  extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_verify_pack(int argc, const char **argv, const char *prefix);
 +extern int cmd_show_ref(int argc, const char **argv, const char *prefix);
+ extern int cmd_pack_refs(int argc, const char **argv, const char *prefix);
  
  #endif

diff --cc git.c
index fedd53683e710cde1e1e04d0152261fff4c2eee4,de2a06b973a4ae99a8cb097e4efa627be3817317..9afb94d790c483561e7152b5be147de1aa6a934e
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -266,7 -269,7 +269,8 @@@ static void handle_internal_command(in
                { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
                { "write-tree", cmd_write_tree, RUN_SETUP },
                { "verify-pack", cmd_verify_pack },
 +              { "show-ref", cmd_show_ref, RUN_SETUP },
+               { "pack-refs", cmd_pack_refs, RUN_SETUP },
        };
        int i;