dc23d67a42
Use --force-with-lease instead of --force for git push
...
--force flag can be very dangerous, because it unconditionally
overwrites remote branch - if someone pushed new commits to the remote
repo after you last fetched/pulled, and you do push --force, you will
overwrite his commits without even knowing that you did that. Using
--force-with-lease is much safer because it only overwrites remote
branch when it points to the same commit that you think it points to.
Read more:
https://developer.atlassian.com/blog/2015/04/force-with-lease/
2015-10-30 16:17:56 +01:00
e71a3e0cdb
Replace (almost) all instance of script.split
2015-10-28 16:43:24 +01:00
280751b36e
Fix the unzip rules and filenames with spaces
2015-10-28 15:13:33 +01:00
0a6a3db65d
Fix the untar rules and filenames with spaces
2015-10-28 15:12:59 +01:00
590fdba2aa
Fix `rules.touch` tests
...
Move them to `rules` sub-directory and import `shells` instead of `and_`
which in turn triggers the `generic_shell` fixture fixing the tests on
Fish Shell.
2015-10-18 19:49:46 -02:00
540ff7e16d
Merge pull request #387 from scorphus/git-two-dashes
...
Add `git_two_dashes` rule
2015-10-19 01:50:04 +08:00
5e44fb22be
Fix rules.brew_install tests on Mac
2015-10-17 18:46:07 -03:00
5389d0c106
Add `git_two_dashes` rule
2015-10-17 18:40:53 -03:00
213791d3c2
#369 Fix `git_fix_stash` fails when script is just `git`
2015-09-10 14:28:22 +03:00
3e8db28a73
#355 Add `touch` rule
2015-09-09 10:53:56 +03:00
3fc2efee0f
#366 Don't make bash history checks in travis-ci, it works incorrectly
2015-09-08 17:48:33 +03:00
cb14aded6b
#366 Remove sleep before checking history
2015-09-08 17:47:04 +03:00
08af616e3d
#366 Add sleep before checking history
2015-09-08 17:39:52 +03:00
b8ce95ad68
Minor refactoring
2015-09-08 15:24:49 +03:00
1173f9f59c
Organize settings initialization logic in `Settings`
2015-09-08 15:15:53 +03:00
a8dbc48fd4
Move commands-related logic to `Command` and `CorrectedCommand`
2015-09-08 15:00:57 +03:00
4a27595e97
Move rule-related code to `Rule`
2015-09-08 14:18:11 +03:00
bf80d97062
Remove obscure `SortedCorrectedCommandsSequence`
2015-09-08 12:52:10 +03:00
1fb6dd925b
Remove `on_change` from `CommandSelector`
2015-09-08 12:27:17 +03:00
b2be0b3cad
Remove obscure `RulesNamesList` and `DefaultRulesNames`
2015-09-08 12:14:39 +03:00
488c1dad79
Merge branch 'master' of github.com:nvbn/thefuck into fix-unzip
2015-09-07 21:12:14 +02:00
c3fe7e5e68
Fix #363
2015-09-07 20:48:10 +02:00
f3525e9fe0
#364 Attach `user_dir` to settings
2015-09-07 18:59:10 +03:00
df4d2cc88d
⚠️ Remove `settings` param from rules `match`, `get_new_command` and `side_effect`
2015-09-07 13:00:29 +03:00
382eb8b86c
Fix tests
2015-09-07 12:12:16 +03:00
105d3d8137
Make settings a global singleton
2015-09-06 21:47:12 +03:00
f964c65f16
#362 Fix tests for python 2
2015-09-06 13:40:29 +03:00
dd0667ea8f
#356 Ignore `thefuck` entry points
2015-09-06 13:37:48 +03:00
4392872568
#356 Print useful information when `fuck` called and alias isn't configured
2015-09-06 13:29:42 +03:00
2f9db24ed1
#357 Add `exclude_rules` settings option
2015-09-06 12:55:59 +03:00
5cfd493d05
Make "arrows" tests less dependent on environment
2015-09-06 01:24:29 +03:00
22eac045c8
Use `@pytest.mark.once_without_docker`
2015-09-06 01:14:49 +03:00
cdd5f21e88
Add `functional` marker
2015-09-06 01:13:44 +03:00
8cc19daaaa
Use `pytest-docker-pexpect` for func tests
2015-09-06 00:56:18 +03:00
8bf4182f86
Fix install script on non-ubuntu
2015-09-05 11:54:59 +03:00
e2e8b6fc86
Fix without result
2015-09-05 11:45:39 +03:00
6321f25533
Fix bare run of func tests
2015-09-02 13:52:06 +03:00
9a02e821cd
Fix python 2 support
2015-09-02 11:54:58 +03:00
4129ff2717
#353 Cache aliases in a temporary file
2015-09-02 11:10:03 +03:00
ea6600be8b
Kill containers after func tests
2015-09-02 10:33:45 +03:00
50207d8180
Merge pull request #352 from mcarton/slow
...
Fix slowness problems II
2015-09-02 09:36:48 +03:00
45d849b1ac
Use `thefuck --alias` in func tests
2015-09-01 18:36:25 +03:00
ff8d61a4fb
Merge branch 'master' of github.com:nvbn/thefuck into slow
2015-09-01 14:43:41 +02:00
6dcf9a3a14
Fix python 2 support
2015-09-01 15:32:23 +03:00
8b62959fe3
Merge branch 'master' of github.com:nvbn/thefuck into slow
2015-09-01 14:28:30 +02:00
21103d1b50
Simplify corrector steps
2015-09-01 14:43:27 +03:00
61937e9e8f
#334 : Wait only for first matched rule; regression: always show arrows
2015-09-01 14:34:41 +03:00
5d74344994
Make `CorrectedCommand` ignore priority when checking equality
2015-09-01 13:03:24 +03:00
12394ca842
#334 : Don't wait for all rules before showing result
2015-09-01 12:51:41 +03:00
ebe53f0d18
Use decorator library
2015-08-27 16:52:26 +03:00
Jan Warchoł
mcarton
Pablo Santiago Blum de Aguiar
Vladimir Iakovlev