From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jan 2014 18:44:20 +0000 (-0800)
Subject: Merge branch 'jk/interpret-branch-name-fix'
X-Git-Tag: v1.9-rc1~18
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4e9f9320e3238ea32df84010dae45d01923a0de5;p=git-core%2Fgit.git

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

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

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

4e9f9320e3238ea32df84010dae45d01923a0de5