Merge branch 'js/maint-fast-export-mark-error'

diff --git a/unpack-trees.c b/unpack-trees.c
index bcee99c52e3a9ee8d67f70c577e57bbde8a8b610..ad40109432971b8b26f107a84b02aeb405e8daf9 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1210,7 +1210,7 @@ static int verify_uptodate_1(struct cache_entry *ce,
                        return 0;
                /*
                 * NEEDSWORK: the current default policy is to allow
-                * submodule to be out of sync wrt the supermodule
+                * submodule to be out of sync wrt the superproject
                 * index.  This needs to be tightened later for
                 * submodules that are marked to be automatically
                 * checked out.