summaryrefslogtreecommitdiff
path: root/remote.h
diff options
context:
space:
mode:
authorTay Ray Chuan <rctay89@gmail.com>2010-01-08 02:12:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-10 07:34:10 (GMT)
commit20e8b465a53e651cc3f50bd60f39d577ecdb7722 (patch)
tree601e0e19befeac61d5ac60b35bb2a588f1b738f3 /remote.h
parent7b69079be964ca0a09a1a7895455ba3df379984e (diff)
downloadgit-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 'remote.h')
-rw-r--r--remote.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/remote.h b/remote.h
index 8b7ecf9..6e13643 100644
--- a/remote.h
+++ b/remote.h
@@ -98,6 +98,8 @@ char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
int match_refs(struct ref *src, struct ref **dst,
int nr_refspec, const char **refspec, int all);
+void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
+ int force_update);
/*
* Given a list of the remote refs and the specification of things to