Merge lt/revlist,jc/diff,jc/revparse,jc/abbrev

diff --git a/verify-pack.c b/verify-pack.c
index 30c40feebdf4369683dbb365caa13faeb5699f82..c99db9dd79315dff4ac19c79b35275cd02397e60 100644 (file)
--- a/verify-pack.c
+++ b/verify-pack.c
@@ -15,19 +15,19 @@ static int verify_one_pack(char *arg, int verbose)
                        len--;
                }
                /* Should name foo.idx now */
-               if ((g = add_packed_git(arg, len)))
+               if ((g = add_packed_git(arg, len, 1)))
                        break;
                /* No?  did you name just foo? */
                strcpy(arg + len, ".idx");
                len += 4;
-               if ((g = add_packed_git(arg, len)))
+               if ((g = add_packed_git(arg, len, 1)))
                        break;
                return error("packfile %s not found.", arg);
        }
        return verify_pack(g, verbose);
 }
 
-static const char *verify_pack_usage = "git-verify-pack [-v] <pack>...";
+static const char verify_pack_usage[] = "git-verify-pack [-v] <pack>...";
 
 int main(int ac, char **av)
 {