sha1_file: make check_and_freshen_file() non static

diff --git a/transport.c b/transport.c
index f48286905786a9492edd82adc3b633411dbce152..04e5d6623e39014622e0a185d37f8a456fd352e6 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -955,15 +955,18 @@ int transport_push(struct transport *transport,
                                if (!is_null_oid(&ref->new_oid))
                                        sha1_array_append(&commits, ref->new_oid.hash);
 
-                       if (!push_unpushed_submodules(&commits, transport->remote->name)) {
+                       if (!push_unpushed_submodules(&commits,
+                                                     transport->remote->name,
+                                                     pretend)) {
                                sha1_array_clear(&commits);
                                die("Failed to push all needed submodules!");
                        }
                        sha1_array_clear(&commits);
                }
 
-               if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
-                             TRANSPORT_RECURSE_SUBMODULES_CHECK)) && !is_bare_repository()) {
+               if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) ||
+                    ((flags & TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND) &&
+                     !pretend)) && !is_bare_repository()) {
                        struct ref *ref = remote_refs;
                        struct string_list needs_pushing = STRING_LIST_INIT_DUP;
                        struct sha1_array commits = SHA1_ARRAY_INIT;