From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Feb 2014 21:38:25 +0000 (-0800)
Subject: Merge branch 'jk/interpret-branch-name-fix' into maint
X-Git-Tag: v1.8.5.5~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/21261fabdde83514ddac0bbba96fdeb83a5c2363?hp=--cc

Merge branch 'jk/interpret-branch-name-fix' into maint

A handful of bugs around interpreting $branch@{upstream} notation
and its lookalike, when $branch part has interesting characters,
e.g. "@", and ":", have been fixed.

* jk/interpret-branch-name-fix:
interpret_branch_name: find all possible @-marks
interpret_branch_name: avoid @{upstream} past colon
interpret_branch_name: always respect "namelen" parameter
interpret_branch_name: rename "cp" variable to "at"
interpret_branch_name: factor out upstream handling
---

21261fabdde83514ddac0bbba96fdeb83a5c2363