MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-01-18 20:11:17 +00:00
Code Issues Releases Wiki Activity

Change: rules_git_checkout handling branch names with slashes & Remote HEAD. (#944)

Browse Source 
* Add: Test for branch names with slashes & Remote HEAD.

* - Add: Handling for removing remote HEAD.
- Change: Improved handling for branches with slash in their names.
This commit is contained in:
ik1ne 2019-09-03 02:16:40 +09:00 committed by Vladimir Iakovlev
parent 1683f45e94
commit 84c16fb69a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/rules/test_git_checkout.py
View File

@ -39,6 +39,11 @@ def test_not_match(command):
(b'', []), (b'', []),
(b'* master', ['master']), (b'* master', ['master']),
(b' remotes/origin/master', ['master']), (b' remotes/origin/master', ['master']),
(b' remotes/origin/test/1', ['test/1']),
(b' remotes/origin/test/1/2/3', ['test/1/2/3']),
(b' test/1', ['test/1']),
(b' test/1/2/3', ['test/1/2/3']),
(b' remotes/origin/HEAD -> origin/master', []),
(b' just-another-branch', ['just-another-branch']), (b' just-another-branch', ['just-another-branch']),
(b'* master\n just-another-branch', ['master', 'just-another-branch']), (b'* master\n just-another-branch', ['master', 'just-another-branch']),
(b'* master\n remotes/origin/master\n just-another-branch', (b'* master\n remotes/origin/master\n just-another-branch',

6
thefuck/rules/git_checkout.py
View File

@ -18,10 +18,12 @@ def get_branches():
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
for line in proc.stdout.readlines(): for line in proc.stdout.readlines():
line = line.decode('utf-8') line = line.decode('utf-8')
if '->' in line: # Remote HEAD like b' remotes/origin/HEAD -> origin/master'
continue
if line.startswith('*'): if line.startswith('*'):
line = line.split(' ')[1] line = line.split(' ')[1]
if '/' in line: if line.strip().startswith('remotes/'):
line = line.split('/')[-1] line = '/'.join(line.split('/')[2:])
yield line.strip() yield line.strip()