Merge branch 'fr_l10n_v2.13_rnd2' of git://github.com/jnavila/git

diff --git a/strbuf.c b/strbuf.c
index ace58e7367300975e118660ed2004c7d0885481c..00457940cfc163fed58b0206f5167c25c2c71b8a 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -449,6 +449,17 @@ int strbuf_getcwd(struct strbuf *sb)
                        strbuf_setlen(sb, strlen(sb->buf));
                        return 0;
                }
+
+               /*
+                * If getcwd(3) is implemented as a syscall that falls
+                * back to a regular lookup using readdir(3) etc. then
+                * we may be able to avoid EACCES by providing enough
+                * space to the syscall as it's not necessarily bound
+                * to the same restrictions as the fallback.
+                */
+               if (errno == EACCES && guessed_len < PATH_MAX)
+                       continue;
+
                if (errno != ERANGE)
                        break;
        }