Merge branch 'jc/clean' into next

diff --git a/pack-objects.c b/pack-objects.c
index 5b2ef9a51387dc01e9d31f08962101cf1323e3e2..523a1c7da8f1baf70d2f700dbafa8e78f9a1c4b3 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -1243,6 +1243,7 @@ int main(int argc, char **argv)
 
        setup_git_directory();
 
+       progress = isatty(2);
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
 
@@ -1273,6 +1274,10 @@ int main(int argc, char **argv)
                                        usage(pack_usage);
                                continue;
                        }
+                       if (!strcmp("--progress", arg)) {
+                               progress = 1;
+                               continue;
+                       }
                        if (!strcmp("-q", arg)) {
                                progress = 0;
                                continue;