[PATCH resend 2/3] transport-helper.c::push_refs(): know more about refs before pushing

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Tay Ray Chuan
Date: Thursday, December 3, 2009 - 11:57 pm

Know about rejected non-fast-forward refs, in addition to up-to-date
ones, by calling set_ref_status_for_push() in remote.[ch], before
passing push commands to the helper.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
---
 transport-helper.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/transport-helper.c b/transport-helper.c
index 11f3d7e..6ed7b55 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -334,16 +334,12 @@ static int push_refs(struct transport *transport,
 		else if (!mirror)
 			continue;

-		ref->deletion = is_null_sha1(ref->new_sha1);
-		if (!ref->deletion &&
-			!hashcmp(ref->old_sha1, ref->new_sha1)) {
-			ref->status = REF_STATUS_UPTODATE;
-			continue;
-		}
-
 		if (force_all)
 			ref->force = 1;

+		if (set_ref_status_for_push(ref, force_all))
+			continue;
+
 		strbuf_addstr(&buf, "push ");
 		if (!ref->deletion) {
 			if (ref->force)
--
1.6.6.rc1.286.gbc15a

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH resend 0/3] transport: catch non-fast-forwards, Tay Ray Chuan, (Thu Dec 3, 11:54 pm)
[PATCH resend 1/3] refactor ref status logic for pushing, Tay Ray Chuan, (Thu Dec 3, 11:56 pm)
[PATCH resend 2/3] transport-helper.c::push_refs(): know m ..., Tay Ray Chuan, (Thu Dec 3, 11:57 pm)
[PATCH v2 0/3] transport: catch non-fast-forwards, Tay Ray Chuan, (Tue Dec 8, 7:34 am)
[PATCH v2 1/3] refactor ref status logic for pushing, Tay Ray Chuan, (Tue Dec 8, 7:35 am)
Re: [PATCH v2 1/3] refactor ref status logic for pushing, Daniel Barkalow, (Tue Dec 8, 10:17 am)
Re: [PATCH v2 1/3] refactor ref status logic for pushing, Daniel Barkalow, (Wed Dec 9, 12:13 am)
[PATCH v3 0/6] transport: catch non-fast forwards, Tay Ray Chuan, (Thu Dec 24, 12:40 am)
[PATCH v3 3/6] refactor ref status logic for pushing, Tay Ray Chuan, (Thu Dec 24, 12:42 am)
[PATCH v4 0/6] transport: catch non-fast forwards, Tay Ray Chuan, (Thu Jan 7, 7:12 pm)
[PATCH v4 3/6] refactor ref status logic for pushing, Tay Ray Chuan, (Thu Jan 7, 7:12 pm)