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

Merge branch 'jh/checkout-auto-tracking' into maint

Browse Source 
"git branch --track" had a minor regression in v1.8.3.2 and later
that made it impossible to base your local work on anything but a
local branch of the upstream repository you are tracking from.

* jh/checkout-auto-tracking:
  t3200: fix failure on case-insensitive filesystems
  branch.c: Relax unnecessary requirement on upstream's remote ref name
  t3200: Add test demonstrating minor regression in 41c21f2
  Refer to branch.<name>.remote/merge when documenting --track
  t3200: Minor fix when preparing for tracking failure
  t2024: Fix &&-chaining and a couple of typos
This commit is contained in:
Junio C Hamano
2013-10-23 13:32:50 -07:00
parent 6ba0d9551a b0f49ff130
commit 74051fa805
4 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
branch.c
View File

@ -203,8 +203,7 @@ static int check_tracking_branch(struct remote *remote, void *cb_data)
struct refspec query;
memset(&query, 0, sizeof(struct refspec));
query.dst = tracking_branch;
return !(remote_find_tracking(remote, &query) ||
prefixcmp(query.src, "refs/heads/"));
return !remote_find_tracking(remote, &query);
}
static int validate_remote_tracking_branch(char *ref)