summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-30 07:09:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-30 07:09:55 (GMT)
commitfb674d767180354d9ad3e69f1d41bee98df6bfe9 (patch)
treecc96e4d45a06efacd978939e898713f9ede9db0b /setup.c
parentbe653d6cb87d17c1d70d31cb7cfcb004d48def7b (diff)
parent5b42477b59886a85d4b49a60313f9b9d4a0d576f (diff)
downloadgit-fb674d767180354d9ad3e69f1d41bee98df6bfe9.zip
git-fb674d767180354d9ad3e69f1d41bee98df6bfe9.tar.gz
git-fb674d767180354d9ad3e69f1d41bee98df6bfe9.tar.bz2
Merge branch 'maint'
* maint: git-submodule.sh: separate parens by a space to avoid confusing some shells Documentation/technical/api-diff.txt: correct name of diff_unmerge() 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 013ad11..ce87900 100644
--- a/setup.c
+++ b/setup.c
@@ -382,7 +382,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;