From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Mar 2009 07:28:46 +0000 (-0700)
Subject: Merge branch 'db/push-cleanup'
X-Git-Tag: v1.6.3-rc0~79
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f23336f5c15eb90df3275076181d10746479be5b;p=git.git

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
---

f23336f5c15eb90df3275076181d10746479be5b
diff --cc transport.c
index 9ae92cd39,73bb9b50b..3dfb03c06
--- a/transport.c
+++ b/transport.c
@@@ -138,12 -138,7 +138,12 @@@ static void insert_packed_refs(const ch
  	}
  }
  
 +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)
+ 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;