Skip to content

Commit

Permalink
Merge branch 'cb/uname-in-untracked'
Browse files Browse the repository at this point in the history
An experimental "untracked cache" feature used uname(2) in a
slightly unportable way.

* cb/uname-in-untracked:
  untracked: fix detection of uname(2) failure
  • Loading branch information
Junio C Hamano committed Aug 3, 2015
2 parents c0b901e + 100e433 commit 8e699cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 8e699cd

Please sign in to comment.