| commit | 21261fabdde83514ddac0bbba96fdeb83a5c2363 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Feb 2014 21:38:25 +0000 (13 13:38 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Feb 2014 21:38:25 +0000 (13 13:38 -0800) | ||
| tree | f4c36514c93d31287708ad2320897ed8802b05bc | treesnapshot (tar.gz zip) |
| parent | 7c9b668b83c68f14d7249170a0609554a7b4a0fe | commitdiff |
| parent | 9892d5d4541d93a8a6a4fd9ac4178d71d0d308e3 | commitdiff |
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
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