Merge branch 'ab/pager-exit-log'

[thirdparty/git.git] / tmp-objdir.c

diff --git a/tmp-objdir.c b/tmp-objdir.c
index e78e481d8ecb6396bad159ce0991c19c80367cc2..b8d880e3626a9cdbc818cf69bda67fcd256194b1 100644 (file)
--- a/tmp-objdir.c
+++ b/tmp-objdir.c
@@ -185,9 +185,11 @@ static int pack_copy_priority(const char *name)
                return 1;
        if (ends_with(name, ".pack"))
                return 2;
-       if (ends_with(name, ".idx"))
+       if (ends_with(name, ".rev"))
                return 3;
-       return 4;
+       if (ends_with(name, ".idx"))
+               return 4;
+       return 5;
 }
 
 static int pack_copy_cmp(const char *a, const char *b)
@@ -283,7 +285,7 @@ const char **tmp_objdir_env(const struct tmp_objdir *t)
 {
        if (!t)
                return NULL;
-       return t->env.argv;
+       return t->env.v;
 }
 
 void tmp_objdir_add_as_alternate(const struct tmp_objdir *t)