| commit | 4e9f9320e3238ea32df84010dae45d01923a0de5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Jan 2014 18:44:20 +0000 (27 10:44 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Jan 2014 18:44:21 +0000 (27 10:44 -0800) | ||
| tree | 9eae1d5218745b3ceedbebcfe0d2b9f3f0b4aeb8 | treesnapshot (tar.gz zip) |
| parent | f583ace15762e2f9f68ccfcf0ec0e0527b2a899d | commitdiff |
| parent | 9892d5d4541d93a8a6a4fd9ac4178d71d0d308e3 | commitdiff |
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
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
| sha1_name.c | diff1 | diff2 | blobhistory |