Thread (18 messages) flat view 18 messages, 2 authors, 2016-06-15
STALE3742d

Revision v1 of 5 in this series.

Revisions (5)
  1. v1 current
  2. v3 [diff vs current]
  3. v4 [diff vs current]
  4. v7 [diff vs current]
  5. v7 [diff vs current]

[PATCH 9/9] transport-helper: don't update refs in dry-run

From: Felipe Contreras <hidden>
Date: 2016-06-15 22:58:33
Subsystem: the rest · Maintainer: Linus Torvalds

The remote helper namespace should not be updated.

Signed-off-by: Felipe Contreras <redacted>
---
 transport-helper.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index 5490796..9bbf209 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -715,7 +715,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;
@@ -729,7 +730,7 @@ static void push_update_refs_status(struct helper_data *data,
 		if (push_update_ref_status(&buf, &ref, remote_refs))
 			continue;
 
-		if (!data->refspecs)
+		if (flags & TRANSPORT_PUSH_DRY_RUN || !data->refspecs)
 			continue;
 
 		/* propagate back the update to the remote namespace */
@@ -799,7 +800,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;
 }
 
@@ -867,7 +868,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;
 }
 
-- 
1.8.4-fc
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help