diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2010-01-08 02:12:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-10 07:34:10 (GMT) |
| commit | 20e8b465a53e651cc3f50bd60f39d577ecdb7722 (patch) | |
| tree | 601e0e19befeac61d5ac60b35bb2a588f1b738f3 /transport-helper.c | |
| parent | 7b69079be964ca0a09a1a7895455ba3df379984e (diff) | |
| download | git-20e8b465a53e651cc3f50bd60f39d577ecdb7722.zip git-20e8b465a53e651cc3f50bd60f39d577ecdb7722.tar.gz git-20e8b465a53e651cc3f50bd60f39d577ecdb7722.tar.bz2 | |
refactor ref status logic for pushing
Move the logic that detects up-to-date and non-fast-forward refs to a
new function in remote.[ch], set_ref_status_for_push().
Make transport_push() invoke set_ref_status_for_push() before invoking
the push_refs() implementation. (As a side-effect, the push_refs()
implementation in transport-helper.c now knows of non-fast-forward
pushes.)
Removed logic for detecting up-to-date refs from the push_refs()
implementation in transport-helper.c, as transport_push() has already
done so for it.
Make cmd_send_pack() invoke set_ref_status_for_push() before invoking
send_pack(), as transport_push() can't do it for send_pack() here.
Mark the test on the return status of non-fast-forward push to fail.
Git now exits with success, as transport.c::transport_push() does not
check for refs with status REF_STATUS_REJECT_NONFASTFORWARD nor does it
indicate rejected pushes with its return value.
Mark the test for ref status to succeed. As mentioned earlier, refs
might be marked as non-fast-forwards, triggering the push status
printing mechanism in transport.c.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport-helper.c')
| -rw-r--r-- | transport-helper.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/transport-helper.c b/transport-helper.c index 11f3d7e..7c9b569 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -329,16 +329,16 @@ static int push_refs(struct transport *transport, return 1; for (ref = remote_refs; ref; ref = ref->next) { - if (ref->peer_ref) - hashcpy(ref->new_sha1, ref->peer_ref->new_sha1); - else if (!mirror) + if (!ref->peer_ref && !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; + /* Check for statuses set by set_ref_status_for_push() */ + switch (ref->status) { + case REF_STATUS_REJECT_NONFASTFORWARD: + case REF_STATUS_UPTODATE: continue; + default: + ; /* do nothing */ } if (force_all) |