Merge branch 'jc/maint-bundle-too-quiet' into maint

* jc/maint-bundle-too-quiet: Teach progress eye-candy to fetch_refs_from_bundle()
2011-10-15 20:46:39 -07:00
parent 3197bd850b be042aff24
commit 6323a14701
4 changed files with 10 additions and 5 deletions
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@ -58,7 +58,7 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
 	} else if (!strcmp(cmd, "unbundle")) {
 		if (!startup_info->have_repository)
 			die(_("Need a repository to unbundle."));
-		return !!unbundle(&header, bundle_fd) ||
+		return !!unbundle(&header, bundle_fd, 0) ||
 			list_bundle_refs(&header, argc, argv);
 	} else
 		usage(builtin_bundle_usage);