From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Jan 2010 22:39:48 +0000 (-0800)
Subject: Merge branch 'tr/http-push-ref-status'
X-Git-Tag: v1.7.0-rc0~74
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=07301eaa766efac7818eac7a4a6db0d0c3948d66;p=git.git

Merge branch 'tr/http-push-ref-status'

* tr/http-push-ref-status:
  transport-helper.c::push_refs(): emit "no refs" error message
  transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
  transport.c::transport_push(): make ref status affect return value
  refactor ref status logic for pushing
  t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
  t5541-http-push.sh: add tests for non-fast-forward pushes

Conflicts:
	transport-helper.c
---

07301eaa766efac7818eac7a4a6db0d0c3948d66
diff --cc transport-helper.c
index ca8fa92e6,8c0b575f3..fdf225622
--- a/transport-helper.c
+++ b/transport-helper.c
@@@ -523,13 -321,11 +523,16 @@@ static int push_refs(struct transport *
  	struct child_process *helper;
  	struct ref *ref;
  
 +	if (process_connect(transport, 1)) {
 +		do_take_over(transport);
 +		return transport->push_refs(transport, remote_refs, flags);
 +	}
 +
- 	if (!remote_refs)
+ 	if (!remote_refs) {
+ 		fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
+ 			"Perhaps you should specify a branch such as 'master'.\n");
  		return 0;
+ 	}
  
  	helper = get_helper(transport);
  	if (!data->push)