rebase: use the new git-rebase--preserve-merges.sh

diff --git a/submodule-config.c b/submodule-config.c
index 602ba8ca8b8455df9b34e2990397c838d542569f..3f2075764feb53fc8c981aab39d16c6b191cb6d8 100644 (file)
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -520,7 +520,7 @@ static const struct submodule *config_from(struct submodule_cache *cache,
        if (submodule)
                goto out;
 
-       config = read_sha1_file(oid.hash, &type, &config_size);
+       config = read_object_file(&oid, &type, &config_size);
        if (!config || type != OBJ_BLOB)
                goto out;