diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-03-25 12:54:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-25 12:54:19 -0700 |
commit | 09e32fa0f886c5ce5ded5e213f690ed32017f369 (patch) | |
tree | f532895a03ee23154887a84cf84eb5715009e0b1 | |
parent | Merge branch 'ct/prompt-untracked-fix' (diff) | |
parent | sha1fd_check: die when we cannot open the file (diff) | |
download | tgif-09e32fa0f886c5ce5ded5e213f690ed32017f369.tar.xz |
Merge branch 'jk/simplify-csum-file-sha1fd-check'
Code simplification.
* jk/simplify-csum-file-sha1fd-check:
sha1fd_check: die when we cannot open the file
-rw-r--r-- | csum-file.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/csum-file.c b/csum-file.c index b00b215031..a172199e44 100644 --- a/csum-file.c +++ b/csum-file.c @@ -130,14 +130,10 @@ struct sha1file *sha1fd_check(const char *name) sink = open("/dev/null", O_WRONLY); if (sink < 0) - return NULL; + die_errno("unable to open /dev/null"); check = open(name, O_RDONLY); - if (check < 0) { - int saved_errno = errno; - close(sink); - errno = saved_errno; - return NULL; - } + if (check < 0) + die_errno("unable to open '%s'", name); f = sha1fd(sink, name); f->check_fd = check; return f; |