mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  change throughput display units with fast links
  clone: Supply the right commit hash to post-checkout when -b is used
  remote-curl: add missing initialization of argv0_path
This commit is contained in:
Junio C Hamano
2009-10-14 01:54:51 -07:00
parent 9ecb2a7f49 583371af1f
commit 18a536476e
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin-clone.c
View File

@ -641,7 +641,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
die("unable to write new index file"); die("unable to write new index file");
err |= run_hook(NULL, "post-checkout", sha1_to_hex(null_sha1), err |= run_hook(NULL, "post-checkout", sha1_to_hex(null_sha1),
sha1_to_hex(remote_head->old_sha1), "1", NULL); sha1_to_hex(our_head_points_at->old_sha1), "1",
NULL);
if (!err && option_recursive) if (!err && option_recursive)
err = run_command_v_opt(argv_submodule, RUN_GIT_CMD); err = run_command_v_opt(argv_submodule, RUN_GIT_CMD);

8
progress.c
View File

@ -131,7 +131,13 @@ static void throughput_string(struct throughput *tp, off_t total,
} else { } else {
l -= snprintf(tp->display, l, ", %u bytes", (int)total); l -= snprintf(tp->display, l, ", %u bytes", (int)total);
} }
if (rate)
if (rate > 1 << 10) {
int x = rate + 5; /* for rounding */
snprintf(tp->display + sizeof(tp->display) - l, l,
" | %u.%2.2u MiB/s",
x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
} else if (rate)
snprintf(tp->display + sizeof(tp->display) - l, l, snprintf(tp->display + sizeof(tp->display) - l, l,
" | %u KiB/s", rate); " | %u KiB/s", rate);
} }

2
remote-curl.c
View File

@ -3,6 +3,7 @@
#include "strbuf.h" #include "strbuf.h"
#include "walker.h" #include "walker.h"
#include "http.h" #include "http.h"
#include "exec_cmd.h"
static struct ref *get_refs(struct walker *walker, const char *url) static struct ref *get_refs(struct walker *walker, const char *url)
{ {
@ -82,6 +83,7 @@ int main(int argc, const char **argv)
const char *url; const char *url;
struct walker *walker = NULL; struct walker *walker = NULL;
git_extract_argv0_path(argv[0]);
setup_git_directory(); setup_git_directory();
if (argc < 2) { if (argc < 2) {
fprintf(stderr, "Remote needed\n"); fprintf(stderr, "Remote needed\n");