summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-30 00:09:41 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-30 00:09:41 -0700
commit5b42477b59886a85d4b49a60313f9b9d4a0d576f (patch)
tree55e42d432085f0afec9a5bc9f4251adcf1dcbfa5 /setup.c
parenta059240f06967f485e0a094e220bae73a746ed24 (diff)
parentb1905aeac5aded421cd90f8d264e27bb39672b36 (diff)
downloadgit-5b42477b59886a85d4b49a60313f9b9d4a0d576f.tar.gz
Merge branch 'jm/maint-misc-fix' into maint
* jm/maint-misc-fix: read_gitfile_gently: use ssize_t to hold read result remove tests of always-false condition rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.c b/setup.c
index 03cd84f2fc..e7a37863cc 100644
--- a/setup.c
+++ b/setup.c
@@ -275,7 +275,7 @@ const char *read_gitfile_gently(const char *path)
const char *slash;
struct stat st;
int fd;
- size_t len;
+ ssize_t len;
if (stat(path, &st))
return NULL;