diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:26 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:26 -0700 |
commit | 8e699cdb9fc88177617329a10af3c9b28185f2c8 (patch) | |
tree | e81e78c66ac282ce1dbef27c7d13521c271181f0 /dir.c | |
parent | Merge branch 'se/doc-checkout-ours-theirs' (diff) | |
parent | untracked: fix detection of uname(2) failure (diff) | |
download | tgif-8e699cdb9fc88177617329a10af3c9b28185f2c8.tar.xz |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |