diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-02-13 13:38:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-13 13:38:25 -0800 |
| commit | 21261fabdde83514ddac0bbba96fdeb83a5c2363 (patch) | |
| tree | f4c36514c93d31287708ad2320897ed8802b05bc /merge.c | |
| parent | Merge branch 'rk/send-email-ssl-cert' into maint (diff) | |
| parent | interpret_branch_name: find all possible @-marks (diff) | |
| download | tgif-21261fabdde83514ddac0bbba96fdeb83a5c2363.tar.xz | |
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
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions