summaryrefslogtreecommitdiff
path: root/pack-objects.c
diff options
context:
space:
mode:
authorMartin Langhoff <martin@catalyst.net.nz>2006-05-08 10:03:37 +1200
committerMartin Langhoff <martin@catalyst.net.nz>2006-05-08 10:03:37 +1200
commit50c08d48722149d95f46bcc80a5211ea04b8a809 (patch)
tree15c465be37ba4fdd8824edb95085b81076b73af9 /pack-objects.c
parenta248c9614fdd130229fb5f9565abbd77bd1d0cc9 (diff)
parentbe65e7d9fbd3ae6fc097cedade2afe39805fcf4e (diff)
downloadgit-50c08d48722149d95f46bcc80a5211ea04b8a809.tar.gz
Merge with git://kernel.org/pub/scm/git/git.git
Diffstat (limited to 'pack-objects.c')
-rw-r--r--pack-objects.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/pack-objects.c b/pack-objects.c
index 6604338131..53caed42dd 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -1239,6 +1239,7 @@ int main(int argc, char **argv)
setup_git_directory();
+ progress = isatty(2);
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
@@ -1269,6 +1270,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;