summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-03 11:01:26 -0700
committerJunio C Hamano <gitster@pobox.com>2015-08-03 11:01:26 -0700
commit8e699cdb9fc88177617329a10af3c9b28185f2c8 (patch)
treee81e78c66ac282ce1dbef27c7d13521c271181f0 /dir.c
parentc0b901eaf71ca700eb6c8711af0c848df2d011c5 (diff)
parent100e433741715968b815e4b9fb3e638b625bf472 (diff)
downloadgit-8e699cdb9fc88177617329a10af3c9b28185f2c8.tar.gz
Merge branch 'cb/uname-in-untracked'
An experimental "untracked cache" feature used uname(2) in a slightly unportable way. * cb/uname-in-untracked: untracked: fix detection of uname(2) failure
Diffstat (limited to 'dir.c')
-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);