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
1,602 Commits 2 Branches 83 Tags
Commit Graph

1602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Frazier
027b41da59
Add git_merge_unrelated rule for git merge --allow-unrelated-histories (#773) 
From https://git-scm.com/docs/merge-options#merge-options---allow-unrelated-histories

> By default, `git merge` command refuses to merge histories that do not
share a common ancestor. This option can be used to override this safety
when merging histories of two projects that started their lives
independently.
 2018-01-16 20:03:56 -05:00
Guangyuan (Charlie) Yang
aa45585601 Add installation instructions on FreeBSD (#770) 
misc/thefuck has recently been committed to the FreeBSD ports tree (https://svnweb.freebsd.org/ports?view=revision&revision=458123).
 2018-01-10 21:31:38 +01:00
David Hart
c205683a8d git_push: Handle branch names containing 'set-upstream' (#759) 
This should fix https://github.com/nvbn/thefuck/issues/723 (IndexError when using bitbucket)
 2018-01-06 17:44:03 -05:00
David Hart
7c858fadb3 #762: handle single quotes in git_branch_exists 
* handle single quotes in git_branch_exists

* Fix line length

* Fix missing quotes from test
 2018-01-05 19:25:08 -02:00
David Hart
797ca1c564 Offer git commit --amend after previous git commit (#764) 2018-01-05 16:24:43 -05:00
David Hart
7b10a86267 Add rule for ADB unknown commands (#765) 2018-01-05 16:20:03 -05:00
David Hart
b62bb90a0d git_push: Escape single quote in branch names (#760) 
Parameterize test output fixture.

Check for 'push' in command.script_parts than anywhere in command.script.
 2018-01-04 11:40:01 -05:00
Joseph Frazier
a696461cd3 Add apt_upgrade rule (#761) 
* apt_list_upgradable: Prepend sudo to suggestion if used in command

* Add apt_upgrade rule

This suggests `apt upgrade` after `apt list --upgradable` if there are
packages to upgrade. It pairs well with the `apt_list_upgradable` rule,
which suggests `apt list --upgradable` after `apt update` if there are
packages to upgrade.

* Add apt_upgrade rule to README
 2018-01-03 19:01:09 +01:00
Joseph Frazier
7e6d1dbc7c Move Developing instructions from README to CONTRIBUTING (#757) 
* Move Developing instructions from README to CONTRIBUTING

This makes them easier to find, especially for users opening issues or
pull requests. See here for more details:
https://help.github.com/articles/setting-guidelines-for-repository-contributors/

* fixup! Move Developing instructions from README to CONTRIBUTING
 2018-01-03 19:00:20 +01:00
Joseph Frazier
4fb85b0a92 Add GitHub Issue template (#749) 
This prompts the user to include relevant information when reporting
issues. I adapted it from the corresponding section of CONTRIBUTING.md

See here for details: https://github.com/blog/2111-issue-and-pull-request-templates
 2018-01-03 18:59:38 +01:00
David Hart
83e1710712 Fix fish shell aliasing (#753) 
* Handle user defined fish aliases

* Add more aliases to test

* Revert unecessary Popen mock changes

* Add test for fish aliasing

Fixes #727
 2018-01-02 23:14:02 -05:00
Pablo Santiago Blum de Aguiar
045c8ae76c #738: Assert TF_SHELL is defined in bash and zsh aliases 2018-01-02 17:18:34 -02:00
Pablo Santiago Blum de Aguiar
bcb749722b #738: Set SHELL env var for fish and tcsh 2018-01-02 17:18:34 -02:00
David Hart
f700b23f57 Add git merge rule (#755) 
This fixes https://github.com/nvbn/thefuck/issues/629
 2018-01-02 11:47:48 -05:00
Joseph Frazier
897572d278
README: Use pip3 in upgrade command (#756) 
Fixes https://github.com/nvbn/thefuck/issues/615
 2018-01-02 10:14:11 -05:00
Joseph Frazier
0640509895
Drop Python 3.3 Support (#747) 
* Drop Python 3.3 Support

It's reached end-of-life, and our dependencies have started to drop it.
See https://github.com/nvbn/thefuck/pull/744#issuecomment-353244371

* Revert "Use pytest<3.3 to fix Python 3.3 tests (#746)"

This reverts commit f966ecd4f5b8221ee15e843f5ec287e1f7cca940.
 2018-01-01 20:18:05 -05:00
David Hart
57fb6e079a git_push: Make option handling more robust (#751) 
See https://github.com/nvbn/thefuck/issues/740#issuecomment-354466567
 2018-01-01 19:45:46 -05:00
David Hart
83cf97dc26 Suggest git checkout -b (#754) 
This fixes https://github.com/nvbn/thefuck/issues/632

This uses `script_parts` instead of `script.startswith`
to let it work even if there's extra spaces in the command, e.g.

    git  checkout unknown
 2018-01-01 18:30:33 -05:00
Miguel Piedrafita
9e788196e6 Update license year to 2015-2018 (#752) 2018-01-01 12:53:34 -05:00
Joseph Frazier
4ea02a3153
git_push: Don't add duplicate remote/branch name (#745) 
This fixes https://github.com/nvbn/thefuck/issues/740
 2017-12-27 07:54:52 -05:00
Joseph Frazier
f966ecd4f5
Use pytest<3.3 to fix Python 3.3 tests (#746) 
See https://github.com/nvbn/thefuck/pull/744 for context.

I'm personally okay with dropping Python 3.3 support,
but I'd like to at least get the tests working while we decide on that.
 2017-12-20 20:43:01 -05:00
Vladimir Iakovlev
629056077f #783: Don't rely on $SHELL for detecting shell 2017-11-27 21:08:46 +01:00
Vladimir Iakovlev
4780027d63 Bump to 3.25 3.25 2017-11-23 20:51:04 +01:00
Vladimir Iakovlev
4847078f37 #737: Add support of third-party rules 2017-11-23 20:21:44 +01:00
Joseph Frazier
d582159670 Add apt_list_upgradable rule (#732) 
This helps you run `apt list --upgradable` after `apt update`,
as it suggests.
 2017-11-16 20:19:44 +01:00
Jarrod Moore
97123dbf73 Fix zsh alias (#733) 2017-11-16 20:19:16 +01:00
Joseph Frazier
10ac1a3b38
#728: Add heroku_multiple_apps rule (#729) 
Closes https://github.com/nvbn/thefuck/issues/728
 2017-11-09 18:42:23 -05:00
Joseph Frazier
8fb5ddefb6 git_flag_after_filename: Handle new error message 
See 2a5aa826ee
 2017-11-01 09:42:52 -04:00
Joseph Frazier
f1fab0dbb2 git_flag_after_filename: Call match() instead of copying its body 2017-11-01 09:42:52 -04:00
Vladimir Iakovlev
68df7154e5 #N/A: FIx new flake8 warnings 2017-10-25 19:31:03 +02:00
Vladimir Iakovlev
08082e606b #715: Fix work on Windows 2017-10-25 19:16:28 +02:00
Vladimir Iakovlev
b2789ad899 Bump to 3.24 3.24 2017-10-16 20:11:01 +02:00
Vladimir Iakovlev
72f0df2f90 #711: Handle ctrl+n and ctrl+p 2017-10-16 19:19:29 +02:00
Vladimir Iakovlev
50d14be43a Merge branch 'scorphus-pull-request-702' 2017-10-16 19:09:53 +02:00
Vladimir Iakovlev
054fd0b166 #702: Make match in php_s rule more strict 2017-10-16 19:09:44 +02:00
Pablo Santiago Blum de Aguiar
75d2c43997 #702: fix minor issues with php_s rule 
Unfortunately, I didn't catch these issues while reviewing #702.

After looking more closely at `php` options, `-S` requires additional
arguments (<address>:<port>) and `-s` may produce output if used that
way. So, matching ` -s ` seems to be better.

Also, `@for_app('php')` already asserts the presence of `php ` in the
command script. Matching `php -s` prevents the rule from fixing commands
like `php -t public -s 0.0.0.0:8080`.
 2017-10-15 17:18:21 -02:00
Stef Pletinck
64d6835e15 #652: Add new git_push_different_branch_names rule 
Fix #652

* Basic fix for #652
* Finishing work
* Added readme line
* Added test
* My test was stupid...
* Removed redundant lines
* That space...
 2017-10-15 13:30:29 -02:00
Vladimir Iakovlev
2233e3679c Merge branch 'matthewfallshaw-patch-1' 2017-10-15 16:39:49 +02:00
Vladimir Iakovlev
bab5de236f #710: Fix tests 2017-10-15 16:39:40 +02:00
Vladimir Iakovlev
8a4f37edb3 Merge branch 'patch-1' of https://github.com/matthewfallshaw/thefuck into matthewfallshaw-patch-1 2017-10-15 16:32:57 +02:00
Vladimir Iakovlev
a566e040f7 #N/A: Fix deprecation warnings 2017-10-15 16:16:43 +02:00
Vladimir Iakovlev
10a4e910e9 #N/A: Fix deprecation warnings 2017-10-15 16:13:36 +02:00
Vladimir Iakovlev
985b2d9ec9 #N/A: Add brew_cask_dependency rule 2017-10-15 16:11:08 +02:00
Vladimir Iakovlev
a906a751c8 #N/A: Add prove_recursively rule 2017-10-15 15:51:09 +02:00
Matthew Fallshaw
d11ca52ec9 Bugfix: brew_update_formula.py 
Sample command output is:

    Error: This command updates brew itself, and does not take formula names.
    Use 'brew upgrade thefuck' instead.

This will never match the previous `"Use 'brew upgrade <formula>'" in command.output` test.
 2017-10-12 13:43:28 -07:00
Stef Pletinck
e658f35bd9 quick fix for #655 (#702) 
* quick fix for #655

* Enabled by default and fix

* Test

* Added readme line

* This is unnecessary
 2017-10-10 19:24:38 +02:00
Vladimir Iakovlev
21a916d953 #708: Fix handling of shelve errors 2017-10-10 19:19:54 +02:00
Vladimir Iakovlev
d228091beb #707: Don't use @cache on methods 2017-10-10 19:15:36 +02:00
Vladimir Iakovlev
5d14d65837 #707: Use pickle for cache keys 2017-10-10 19:14:42 +02:00
Vladimir Iakovlev
1f8f3dd967 #707: Update tests 2017-10-10 08:31:45 +02:00