diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:44:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:44:21 -0800 |
| commit | 4e9f9320e3238ea32df84010dae45d01923a0de5 (patch) | |
| tree | 9eae1d5218745b3ceedbebcfe0d2b9f3f0b4aeb8 /combine-diff.c | |
| parent | Merge branch 'jk/allow-fetch-onelevel-refname' (diff) | |
| parent | interpret_branch_name: find all possible @-marks (diff) | |
| download | tgif-4e9f9320e3238ea32df84010dae45d01923a0de5.tar.xz | |
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
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions