mirror of
https://github.com/nvbn/thefuck.git
synced 2024-10-06 02:41:10 +01:00
f4cc88f6c7
This avoids adding untracked files to the repo. See here for a description of the difference between `git add .` and `git add --update`: https://stackoverflow.com/questions/572549/difference-between-git-add-a-and-git-add/572660#572660
19 lines
537 B
Python
19 lines
537 B
Python
import pytest
|
|
from thefuck.rules.git_stash_pop import match, get_new_command
|
|
from tests.utils import Command
|
|
|
|
|
|
@pytest.fixture
|
|
def stderr():
|
|
return '''error: Your local changes to the following files would be overwritten by merge:'''
|
|
|
|
|
|
def test_match(stderr):
|
|
assert match(Command('git stash pop', stderr=stderr))
|
|
assert not match(Command('git stash'))
|
|
|
|
|
|
def test_get_new_command(stderr):
|
|
assert (get_new_command(Command('git stash pop', stderr=stderr))
|
|
== "git add --update && git stash pop && git reset .")
|