aboutsummaryrefslogtreecommitdiff
path: root/help.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-24 12:21:47 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-24 12:21:47 -0700
commit510ab3f3c19566b43be02ec13c3326fa04a4a677 (patch)
tree22deebaa0dc0fc0229dd82d3fa4307d35ee84ac0 /help.c
parent5d24b109a64827708cbe98b865aba5d51a2f7c3b (diff)
parent30f8160d26f11156a6792565fe694c813406b929 (diff)
downloadgit-510ab3f3c19566b43be02ec13c3326fa04a4a677.tar.gz
git-510ab3f3c19566b43be02ec13c3326fa04a4a677.tar.xz
Merge branch 'js/sleep-without-select'
Portability fix. * js/sleep-without-select: lockfile: wait using sleep_millisec() instead of select() lockfile: convert retry timeout computations to millisecond help.c: wrap wait-only poll() invocation in sleep_millisec() lockfile: replace random() by rand()
Diffstat (limited to 'help.c')
-rw-r--r--help.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/help.c b/help.c
index 80ca8ee68..d996b3406 100644
--- a/help.c
+++ b/help.c
@@ -394,7 +394,7 @@ const char *help_unknown_cmd(const char *cmd)
if (autocorrect > 0) {
fprintf_ln(stderr, _("in %0.1f seconds automatically..."),
(float)autocorrect/10.0);
- poll(NULL, 0, autocorrect * 100);
+ sleep_millisec(autocorrect * 100);
}
return assumed;
}