pack-objects: don't include missing preferred base objects

diff --git a/builtin-diff.c b/builtin-diff.c
index faaa85a1d45ce6c5f398a44b1241f6325430918b..7ffea975059f9e13b07ca680e6707ffc14973f90 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -296,7 +296,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
         * If the user asked for our exit code then don't start a
         * pager or we would end up reporting its exit code instead.
         */
-       if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS))
+       if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS) &&
+           check_pager_config("diff") != 0)
                setup_pager();
 
        /*