Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more

diff --git a/dir.h b/dir.h
index 02e371090bfe0f55224fb2e03ab28fe68aacea4c..6c45e9d4b9a9055539e443ba30166b0b5384bac5 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -119,7 +119,7 @@ struct dir_struct {
         */
        struct exclude_stack *exclude_stack;
        struct exclude *exclude;
-       char basebuf[PATH_MAX];
+       struct strbuf basebuf;
 };
 
 /*