mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jh/maint-do-not-track-non-branches'

Browse Source 
* jh/maint-do-not-track-non-branches:
  branch/checkout --track: Ensure that upstream branch is indeed a branch
This commit is contained in:
Junio C Hamano
2011-03-15 14:22:13 -07:00
parent 936dfc2202 21b5b1e8dc
commit 663ee1a4c9
4 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
branch.c
View File

@ -175,9 +175,14 @@ void create_branch(const char *head,
die("Cannot setup tracking information; starting point is not a branch.");
break;
case 1:
/* Unique completion -- good, only if it is a real ref */
if (explicit_tracking && !strcmp(real_ref, "HEAD"))
die("Cannot setup tracking information; starting point is not a branch.");
/* Unique completion -- good, only if it is a real branch */
if (prefixcmp(real_ref, "refs/heads/") &&
prefixcmp(real_ref, "refs/remotes/")) {
if (explicit_tracking)
die("Cannot setup tracking information; starting point is not a branch.");
else
real_ref = NULL;
}
break;
default:
die("Ambiguous object name: '%s'.", start_name);