Merge branch 'db/push-cleanup'

* db/push-cleanup:
  Move push matching and reporting logic into transport.c
  Use a common function to get the pretty name of refs

Conflicts:
	transport.c

diff --cc builtin-fetch.c
Simple merge

diff --cc refs.c
Simple merge

diff --cc transport.c
index 9ae92cd39c3f45cb2a58a24801a790ce6622d22c,73bb9b50bec2e9c42488d0b04453e1d5ee06564b..3dfb03c06ed82102f60045d6889db97cf036651e
--- 1/transport.c
--- 2/transport.c
+++ b/transport.c
@@@ -138,12 -138,7 +138,12 @@@ static void insert_packed_refs(const ch
        }
  }
  
- static struct ref *get_refs_via_rsync(struct transport *transport)
 +static const char *rsync_url(const char *url)
 +{
 +      return prefixcmp(url, "rsync://") ? skip_prefix(url, "rsync:") : url;
 +}
 +
+ static struct ref *get_refs_via_rsync(struct transport *transport, int for_push)
  {
        struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT;
        struct ref dummy, *tail = &dummy;