diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-10-14 01:54:51 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-10-14 01:54:51 -0700 |
commit | 18a536476e68349bacab7ddf84166a907dd0bede (patch) | |
tree | 0ebfa3405777e23c57898d7198501504eba8658e | |
parent | 9ecb2a7f496413b9a6404e4a19f7edee029819b8 (diff) | |
parent | 583371af1f88e9cd48fedbb6bbb147d8091fd591 (diff) | |
download | git-18a536476e68349bacab7ddf84166a907dd0bede.tar.gz |
Merge branch 'maint'
* 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
-rw-r--r-- | builtin-clone.c | 3 | ||||
-rw-r--r-- | progress.c | 8 | ||||
-rw-r--r-- | remote-curl.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/builtin-clone.c b/builtin-clone.c index 4992c2597c..5762a6f9d8 100644 --- a/builtin-clone.c +++ b/builtin-clone.c @@ -641,7 +641,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix) die("unable to write new index file"); 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) err = run_command_v_opt(argv_submodule, RUN_GIT_CMD); diff --git a/progress.c b/progress.c index 132ed95a3d..3971f49f4d 100644 --- a/progress.c +++ b/progress.c @@ -131,7 +131,13 @@ static void throughput_string(struct throughput *tp, off_t total, } else { 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, " | %u KiB/s", rate); } diff --git a/remote-curl.c b/remote-curl.c index ad6a1637b5..2faf1c6344 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -3,6 +3,7 @@ #include "strbuf.h" #include "walker.h" #include "http.h" +#include "exec_cmd.h" 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; struct walker *walker = NULL; + git_extract_argv0_path(argv[0]); setup_git_directory(); if (argc < 2) { fprintf(stderr, "Remote needed\n"); |