Skip to content

Commit

Permalink
transport-helper: don't update refs in dry-run
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Felipe Contreras authored and Junio C Hamano committed Oct 31, 2013
1 parent a21455a commit 5a75353
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions transport-helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,8 @@ static int push_update_ref_status(struct strbuf *buf,
}

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;
Expand All @@ -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 (!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 */
Expand Down Expand Up @@ -832,7 +833,7 @@ static int push_refs_with_push(struct transport *transport,
sendline(data, &buf);
strbuf_release(&buf);

push_update_refs_status(data, remote_refs);
push_update_refs_status(data, remote_refs, flags);
return 0;
}

Expand Down Expand Up @@ -886,7 +887,7 @@ static int push_refs_with_export(struct transport *transport,

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;
}

Expand Down

0 comments on commit 5a75353

Please sign in to comment.