git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/builtin-verify-pack.c b/builtin-verify-pack.c
index 7d39d9bcd178a65686d6757f8a89065d25f55b23..4958bbbf11f5f796feedfa7480b827029f912d01 100644 (file)
--- a/builtin-verify-pack.c
+++ b/builtin-verify-pack.c
@@ -40,8 +40,8 @@ static int verify_one_pack(const char *path, int verbose)
        if (!pack)
                return error("packfile %s not found.", arg);
 
+       install_packed_git(pack);
        err = verify_pack(pack, verbose);
-       free(pack);
 
        return err;
 }
@@ -55,6 +55,7 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix)
        int no_more_options = 0;
        int nothing_done = 1;
 
+       git_config(git_default_config);
        while (1 < argc) {
                if (!no_more_options && argv[1][0] == '-') {
                        if (!strcmp("-v", argv[1]))