Merge branch 'rs/obsd-getcwd-workaround'

diff --git a/unpack-trees.c b/unpack-trees.c
index 862cfce661e57e50f7c6030dd5a8eda0add0cca5..38000ac8fad4e8cb626b74bf80197e070084246e 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -286,7 +286,7 @@ static void reload_gitmodules_file(struct index_state *index,
        for (i = 0; i < index->cache_nr; i++) {
                struct cache_entry *ce = index->cache[i];
                if (ce->ce_flags & CE_UPDATE) {
-                       int r = strcmp(ce->name, ".gitmodules");
+                       int r = strcmp(ce->name, GITMODULES_FILE);
                        if (r < 0)
                                continue;
                        else if (r == 0) {