From b6ed4991037a31a824692b1368cd073d574fc1bf Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Tue, 6 Jun 2017 13:56:13 -0400 Subject: [PATCH] Make git_not_command stderr detection backward-compatible --- thefuck/rules/git_not_command.py | 5 +++-- thefuck/utils.py | 13 +++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/thefuck/rules/git_not_command.py b/thefuck/rules/git_not_command.py index 3c47013a..2aecf8d5 100644 --- a/thefuck/rules/git_not_command.py +++ b/thefuck/rules/git_not_command.py @@ -6,12 +6,13 @@ from thefuck.specific.git import git_support @git_support def match(command): return (" is not a git command. See 'git --help'." in command.stderr - and 'The most similar command' in command.stderr) + and ('The most similar command' in command.stderr + or 'Did you mean' in command.stderr)) @git_support def get_new_command(command): broken_cmd = re.findall(r"git: '([^']*)' is not a git command", command.stderr)[0] - matched = get_all_matched_commands(command.stderr, 'The most similar command') + matched = get_all_matched_commands(command.stderr, ['The most similar command', 'Did you mean']) return replace_command(command, broken_cmd, matched) diff --git a/thefuck/utils.py b/thefuck/utils.py index 34698a7e..dbfc6c3b 100644 --- a/thefuck/utils.py +++ b/thefuck/utils.py @@ -141,12 +141,17 @@ def eager(fn, *args, **kwargs): @eager def get_all_matched_commands(stderr, separator='Did you mean'): + if not isinstance(separator, list): + separator = [separator] should_yield = False for line in stderr.split('\n'): - if separator in line: - should_yield = True - elif should_yield and line: - yield line.strip() + for sep in separator: + if sep in line: + should_yield = True + break + else: + if should_yield and line: + yield line.strip() def replace_command(command, broken, matched):