Merge branch 'ef/maint-clone-progress-fix' into maint

Some time ago, "git clone" lost the progress output for its "checkout"
phase; when run without any "--quiet" option, it should give progress to
the lengthy operation.

By Erik Faye-Lund
* ef/maint-clone-progress-fix:
  clone: fix progress-regression
This commit is contained in:
Junio C Hamano 2012-05-14 11:41:40 -07:00
Родитель cb2df36980 8f63da13f8
Коммит c8cf3ec7ae
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -569,7 +569,7 @@ static int checkout(void)
opts.update = 1;
opts.merge = 1;
opts.fn = oneway_merge;
opts.verbose_update = (option_verbosity > 0);
opts.verbose_update = (option_verbosity >= 0);
opts.src_index = &the_index;
opts.dst_index = &the_index;