commit 10643d4ec3b9c5898d93d1c20e98b2ff1906bf79
author Chris Rorvick <chris@rorvick.com> Thu Nov 29 19:41:33 2012 -0600
committer Junio C Hamano <gitster@pobox.com> Sun Dec 02 01:37:20 2012 -0800
tree a0ce129a944ff6a088807e0bc4d5de5b4838dab7
parent b0b00a3ee43b4813eb85728a482500f6422499fd

push: return reject reasons as a bitset

Pass all rejection reasons back from transport_push().  The logic is
simpler and more flexible with regard to providing useful feedback.

Signed-off-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/send-pack.c

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index d342013..9f98607 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -85,7 +85,7 @@
 	int send_all = 0;
 	const char *receivepack = "git-receive-pack";
 	int flags;
-	int nonfastforward = 0;
+	unsigned int reject_reasons;
 	int progress = -1;
 
 	argv++;
@@ -223,7 +223,7 @@
 	ret |= finish_connect(conn);
 
 	if (!helper_status)
-		transport_print_push_status(dest, remote_refs, args.verbose, 0, &nonfastforward);
+		transport_print_push_status(dest, remote_refs, args.verbose, 0, &reject_reasons);
 
 	if (!args.dry_run && remote) {
 		struct ref *ref;