Merge branch 'sb/hashmap-customize-comparison' into sb/diff-color-move

diff --git a/builtin/prune.c b/builtin/prune.c
index 96dca7d58a5353783768ec3298d3a9e70ff40a1b..f0e2bff04c797b630616bddaefa742e736a423a9 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -13,7 +13,7 @@ static const char * const prune_usage[] = {
 };
 static int show_only;
 static int verbose;
-static unsigned long expire;
+static timestamp_t expire;
 static int show_progress = -1;
 
 static int prune_tmp_file(const char *fullpath)
@@ -111,7 +111,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
        };
        char *s;
 
-       expire = ULONG_MAX;
+       expire = TIME_MAX;
        save_commit_buffer = 0;
        check_replace_refs = 0;
        ref_paranoia = 1;
@@ -127,7 +127,8 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
                const char *name = *argv++;
 
                if (!get_oid(name, &oid)) {
-                       struct object *object = parse_object_or_die(oid.hash, name);
+                       struct object *object = parse_object_or_die(&oid,
+                                                                   name);
                        add_pending_object(&revs, object, "");
                }
                else