transport-helper: don't update refs in dry-run

The remote helper namespace should not be updated.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/transport-helper.c b/transport-helper.c
index 985eeea598d99cc6a53adf9bd7e83a43a50ef3e6..d05fc7c27681081219aec3da1c2e818b64c1fd55 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -727,7 +727,8 @@ static int push_update_ref_status(struct strbuf *buf,
 }
 
 static void push_update_refs_status(struct helper_data *data,
 }
 
 static void push_update_refs_status(struct helper_data *data,

-                                   struct ref *remote_refs)
+                                   struct ref *remote_refs,
+                                   int flags)

 {
        struct strbuf buf = STRBUF_INIT;
        struct ref *ref = remote_refs;
 {
        struct strbuf buf = STRBUF_INIT;
        struct ref *ref = remote_refs;


@@ -741,7 +742,7 @@ static void push_update_refs_status(struct helper_data *data,
                if (push_update_ref_status(&buf, &ref, remote_refs))
                        continue;
 
                if (push_update_ref_status(&buf, &ref, remote_refs))
                        continue;
 

-               if (!data->refspecs || data->no_private_update)
+               if (flags & TRANSPORT_PUSH_DRY_RUN || !data->refspecs || data->no_private_update)

                        continue;
 
                /* propagate back the update to the remote namespace */
                        continue;
 
                /* propagate back the update to the remote namespace */


@@ -832,7 +833,7 @@ static int push_refs_with_push(struct transport *transport,
        sendline(data, &buf);
        strbuf_release(&buf);
 
        sendline(data, &buf);
        strbuf_release(&buf);
 

-       push_update_refs_status(data, remote_refs);
+       push_update_refs_status(data, remote_refs, flags);

        return 0;
 }
 
        return 0;
 }
 


@@ -886,7 +887,7 @@ static int push_refs_with_export(struct transport *transport,
 
        if (finish_command(&exporter))
                die("Error while running fast-export");
 
        if (finish_command(&exporter))
                die("Error while running fast-export");

-       push_update_refs_status(data, remote_refs);
+       push_update_refs_status(data, remote_refs, flags);

        return 0;
 }
 
        return 0;
 }