summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-19 14:41:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-19 14:41:28 -0700
commitb083703ce34b27a0f97d7e2d4d2eec196a53b707 (patch)
tree58aa9a7327b85540888b684711c0b4669ec72040
parentMerge branch 'as/sparse-checkout-removal' into maint (diff)
parentuntracked: fix detection of uname(2) failure (diff)
downloadtgif-b083703ce34b27a0f97d7e2d4d2eec196a53b707.tar.xz
Merge branch 'cb/uname-in-untracked' into maint
An experimental "untracked cache" feature used uname(2) in a slightly unportable way. * cb/uname-in-untracked: untracked: fix detection of uname(2) failure
-rw-r--r--dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dir.c b/dir.c
index 8209f8b8af..1d42811cfb 100644
--- a/dir.c
+++ b/dir.c
@@ -1848,7 +1848,7 @@ static const char *get_ident_string(void)
if (sb.len)
return sb.buf;
- if (uname(&uts))
+ if (uname(&uts) < 0)
die_errno(_("failed to get kernel name and information"));
strbuf_addf(&sb, "Location %s, system %s %s %s", get_git_work_tree(),
uts.sysname, uts.release, uts.version);