Merge branch 'tb/avoid-gcc-on-darwin-10-6'

diff --git a/test-sha1-array.c b/test-sha1-array.c
index 700f3f3422d9014bfc4853e1510e6e7ac8aa9b73..60ea1d5f14e2572df5716da5815143ed26a5be4b 100644 (file)
--- a/test-sha1-array.c
+++ b/test-sha1-array.c
@@ -11,7 +11,7 @@ int main(int argc, char **argv)
        struct sha1_array array = SHA1_ARRAY_INIT;
        struct strbuf line = STRBUF_INIT;
 
-       while (strbuf_getline_lf(&line, stdin) != EOF) {
+       while (strbuf_getline(&line, stdin) != EOF) {
                const char *arg;
                unsigned char sha1[20];