Merge branch 'fix'

* fix:
Document --short and --git-dir in git-rev-parse(1)
git-rev-parse: Fix --short= option parsing
Prevent git-upload-pack segfault if object cannot be found
Abstract test_create_repo out for use in tests.
Trap exit to clean up created directory if clone fails.

diff --combined rev-parse.c
index 9161faed1e916c0a3d53c0df4905a2261e626131,70a82714ca061db579838662189049d94453c9e3..a5fb93c3ca993dc240f87a9ac5ee6447b10b7cad
--- 1/rev-parse.c
--- 2/rev-parse.c
+++ b/rev-parse.c
@@@ -48,7 -48,6 +48,7 @@@ static int is_rev_argument(const char *
                "--show-breaks",
                "--sparse",
                "--topo-order",
 +              "--date-order",
                "--unpacked",
                NULL
        };
@@@ -226,12 -225,12 +226,12 @@@ int main(int argc, char **argv
                                continue;
                        }
                        if (!strcmp(arg, "--short") ||
-                           !strncmp(arg, "--short=", 9)) {
+                           !strncmp(arg, "--short=", 8)) {
                                filter &= ~(DO_FLAGS|DO_NOREV);
                                verify = 1;
                                abbrev = DEFAULT_ABBREV;
-                               if (arg[8] == '=')
-                                       abbrev = strtoul(arg + 9, NULL, 10);
+                               if (arg[7] == '=')
+                                       abbrev = strtoul(arg + 8, NULL, 10);
                                if (abbrev < MINIMUM_ABBREV)
                                        abbrev = MINIMUM_ABBREV;
                                else if (40 <= abbrev)

diff --combined sha1_file.c
index 0a3a721e97c89f1dd494831a9321de4668f214c8,f08b1d6ee84617d8d866e9dab66e95ce5a5cc420..9cab99ae7c2b1e59db7be26d79d287254db21211
--- 1/sha1_file.c
--- 2/sha1_file.c
+++ b/sha1_file.c
@@@ -551,8 -551,10 +551,10 @@@ static void prepare_packed_git_one(cha
        sprintf(path, "%s/pack", objdir);
        len = strlen(path);
        dir = opendir(path);
-       if (!dir)
+       if (!dir) {
+               fprintf(stderr, "unable to open object pack directory: %s: %s\n", path, strerror(errno));
                return;
+       }
        path[len++] = '/';
        while ((de = readdir(dir)) != NULL) {
                int namelen = strlen(de->d_name);
@@@ -826,30 -828,11 +828,30 @@@ static unsigned long unpack_object_head
        return offset;
  }
  
 +int check_reuse_pack_delta(struct packed_git *p, unsigned long offset,
 +                         unsigned char *base, unsigned long *sizep,
 +                         enum object_type *kindp)
 +{
 +      unsigned long ptr;
 +      int status = -1;
 +
 +      use_packed_git(p);
 +      ptr = offset;
 +      ptr = unpack_object_header(p, ptr, kindp, sizep);
 +      if (*kindp != OBJ_DELTA)
 +              goto done;
 +      memcpy(base, p->pack_base + ptr, 20);
 +      status = 0;
 + done:
 +      unuse_packed_git(p);
 +      return status;
 +}
 +
  void packed_object_info_detail(struct pack_entry *e,
                               char *type,
                               unsigned long *size,
                               unsigned long *store_size,
 -                             int *delta_chain_length,
 +                             unsigned int *delta_chain_length,
                               unsigned char *base_sha1)
  {
        struct packed_git *p = e->p;
@@@ -863,7 -846,7 +865,7 @@@
        if (kind != OBJ_DELTA)
                *delta_chain_length = 0;
        else {
 -              int chain_length = 0;
 +              unsigned int chain_length = 0;
                memcpy(base_sha1, pack, 20);
                do {
                        struct pack_entry base_ent;