From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Mar 2014 20:50:48 +0000 (-0700)
Subject: Merge branch 'jn/branch-lift-unnecessary-name-length-limit'
X-Git-Tag: v2.0.0-rc0~92
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6bd34241760125481e170bff40b278a41f3d80db?hp=-c

Merge branch 'jn/branch-lift-unnecessary-name-length-limit'

* jn/branch-lift-unnecessary-name-length-limit:
branch.c: delete size check of newly tracked branch names
---

6bd34241760125481e170bff40b278a41f3d80db
diff --combined branch.c
index 723a36bc54,19571b598f..05feaff78a
--- a/branch.c
+++ b/branch.c
@@@ -50,7 -50,7 +50,7 @@@ static int should_setup_rebase(const ch
  void install_branch_config(int flag, const char *local, const char *origin, const char *remote)
  {
  	const char *shortname = remote + 11;
 -	int remote_is_branch = !prefixcmp(remote, "refs/heads/");
 +	int remote_is_branch = starts_with(remote, "refs/heads/");
  	struct strbuf key = STRBUF_INIT;
  	int rebasing = should_setup_rebase(origin);
  
@@@ -114,10 -114,6 +114,6 @@@ static int setup_tracking(const char *n
  	struct tracking tracking;
  	int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
  
- 	if (strlen(new_ref) > 1024 - 7 - 7 - 1)
- 		return error(_("Tracking not set up: name too long: %s"),
- 				new_ref);
- 
  	memset(&tracking, 0, sizeof(tracking));
  	tracking.spec.dst = (char *)orig_ref;
  	if (for_each_remote(find_tracked_branch, &tracking))
@@@ -272,7 -268,7 +268,7 @@@ void create_branch(const char *head
  		break;
  	case 1:
  		/* Unique completion -- good, only if it is a real branch */
 -		if (prefixcmp(real_ref, "refs/heads/") &&
 +		if (!starts_with(real_ref, "refs/heads/") &&
  		    validate_remote_tracking_branch(real_ref)) {
  			if (explicit_tracking)
  				die(_(upstream_not_branch), start_name);
@@@ -290,7 -286,7 +286,7 @@@
  	hashcpy(sha1, commit->object.sha1);
  
  	if (!dont_change_ref) {
 -		lock = lock_any_ref_for_update(ref.buf, NULL, 0);
 +		lock = lock_any_ref_for_update(ref.buf, NULL, 0, NULL);
  		if (!lock)
  			die_errno(_("Failed to lock ref for update"));
  	}
@@@ -306,7 -302,7 +302,7 @@@
  			 start_name);
  
  	if (real_ref && track)
 -		setup_tracking(ref.buf+11, real_ref, track, quiet);
 +		setup_tracking(ref.buf + 11, real_ref, track, quiet);
  
  	if (!dont_change_ref)
  		if (write_ref_sha1(lock, sha1, msg) < 0)