diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-21 02:50:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-21 02:50:59 -0700 |
| commit | 3bec0da08d6df03a103ddc4237cf2c79992c7dd4 (patch) | |
| tree | c6b26993418a86b7c1eb72dcdff17489b5e410b1 /pack-objects.c | |
| parent | 48401221b349696357b35e02ff3e2c3d3c89d306 (diff) | |
| parent | 583b7ea31b7c16f872b178d541591ab816d16f85 (diff) | |
| download | git-3bec0da08d6df03a103ddc4237cf2c79992c7dd4.tar.gz | |
Merge branch 'jc/upload-corrupt' into next
* jc/upload-corrupt:
upload-pack/fetch-pack: support side-band communication
Retire git-clone-pack
upload-pack: prepare for sideband message support.
upload-pack: avoid sending an incomplete pack upon failure
Fix possible out-of-bounds array access
Diffstat (limited to 'pack-objects.c')
| -rw-r--r-- | pack-objects.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pack-objects.c b/pack-objects.c index 179560f2bd..7a8c16c317 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -1221,6 +1221,10 @@ int main(int argc, char **argv) local = 1; continue; } + if (!strcmp("--progress", arg)) { + progress = 1; + continue; + } if (!strcmp("--incremental", arg)) { incremental = 1; continue; |