Commit Graph

635 Commits

Author SHA1 Message Date
Arthas Park
9187f1b04c Add aliases for git switch (gsw) / git restore (grt) 2020-09-06 01:49:39 +09:00
Wilhelmina Drengwitz
6ffbc369b9 Merge pull request #302 from jeffbyrnes/tighten-up-shell-shortcuts
Avoid running ll code if its not used
2020-07-29 17:35:33 -07:00
Jeff Byrnes
800b1b1e0a Avoid running ll code if its not used
Prior to this, if $shell_ls_aliases_enabled="false", this code would
still run, but unnecessarily.
2020-07-29 17:48:53 -04:00
Wilhelmina Drengwitz
e7e9b2bb47 Merge pull request #301 from m-rey/fix_zshrc_path
Use ZDOTDIR env variable for path to .zshrc
2020-03-10 15:03:17 -07:00
Martin Rey
1a7d86fdbc Use ZDOTDIR env variable for path to .zshrc
.zshrc can be found at "~/.zshrc", when ZDOTDIR is not set.
If ZDOTDIR is set, .zshrc is in "${ZDOTDIR}/.zshrc".
Using parameter expansion, the hardcoded path can be replaced with
"${ZDOTDIR:-$HOME}/.zshrc". That way, it'll use the value in
ZDOTDIR when set and the value in HOME when not.
This thus mirrors the usage of ZDOTDIR in zsh and makes the code
more fexible.
2020-03-09 22:25:17 +01:00
Wilhelmina Drengwitz
8f5693f345 Merge pull request #292 from jawshooah/patch-1
Wrap more common shell commands by default
2019-08-29 10:37:47 -04:00
Josh Hagins
2c3b15e13c Wrap more common shell commands by default 2019-08-28 15:01:01 -04:00
Wilhelmina Drengwitz
134d101783 Merge pull request #289 from dump247/master
Fix infinite loop when parent directory does not exist
2019-05-16 13:31:14 -04:00
Cory Thomas
3c97507b3e Make variables local instead of global 2019-05-15 16:33:10 -05:00
Cory Thomas
cebddb8aba Fix infinite loop when parent directory does not exist
resolves #241
2019-05-15 16:25:14 -05:00
Wilhelmina Drengwitz
6b69a5e4d5 Merge pull request #286 from dishbreak/patch-1
Update README.md
2019-02-26 20:23:38 -05:00
Vishal Kotcherlakota
24f96762b1 Update README.md
It took me a minute to figure out how to use the git_index feature. Hopefully this documentation update helps the next person!
2019-02-26 11:05:47 -08:00
Nathan Broadbent
dec2fff0bf Support coreutils on Mac, which provides a greadlink command that supports the -f option (brew install coreutils) 2018-12-19 20:05:05 +07:00
Nathan Broadbent
5bc863284b Change maxdepth to 3 in _find_git_repos (c --rebuild was taking too long) 2018-12-18 21:28:02 +07:00
Wilhelmina Drengwitz
77e5e3776c Merge pull request #281 from ghthor/fix-ci-zsh-install
Add apkg repository update before install
2018-10-17 23:31:44 -04:00
Willa Drengwitz
888a53f1ba Add apkg repository update before install 2018-10-16 18:56:05 -04:00
Wilhelmina Drengwitz
630fd8f834 Merge pull request #280 from HaleTom/fix-gb
Fix #277 - gb doesn't work with no arguments
2018-10-09 12:10:33 -04:00
Tom "Ravi" Hale
d15ece1d99 _scmb_git_branch_shortcuts: quote $@ inside ruby heredoc 2018-10-09 12:12:08 +07:00
Wilhelmina Drengwitz
7152788516 Merge pull request #263 from HaleTom/quote-filenames
Fix #167, #202, #204, #274 and a bunch of other goodies
2018-09-29 08:01:30 -04:00
Wilhelmina Drengwitz
a8cf40722d Merge branch 'master' into quote-filenames 2018-09-28 13:12:38 -04:00
Nathan Broadbent
e5971cfdd5 Added keyboard shortcut to add all changes to the previous commit (Ctrl+x, z) 2018-09-26 23:15:12 +07:00
Nathan Broadbent
8233abd23f Save/restore the git commit message in case a git pre-commit hook fails. Also rename the APPEND var to GIT_COMMIT_MSG_SUFFIX. 2018-09-26 23:08:00 +07:00
Nathan Broadbent
1f60a87a77 Figured out how to set image width in README 2018-09-24 18:16:24 +07:00
Nathan Broadbent
c76a580b97 Fix image path 2018-09-24 18:12:26 +07:00
Nathan Broadbent
7e32c12f6c Fix max-width of image in README 2018-09-24 18:09:48 +07:00
Nathan Broadbent
5530e693b3 Added ~/.staff_sym emoji, and some docs to the README 2018-09-24 18:06:52 +07:00
Tom "Ravi" Hale
29db632289 .travis.yml: add sudo: required
Avoid Travis CI error for zsh on linux:

   $ ./test/support/travisci_deps.sh
   This job is running on container-based infrastructure, which does not
   allow use of 'sudo', setuid, and setgid executables.  If you require
   sudo, add 'sudo: required' to your .travis.yml
2018-09-18 17:03:01 +07:00
Tom "Ravi" Hale
48302bcd8c Be compatible with shells of Ubuntu 14.04 2018-09-18 17:03:01 +07:00
Wilhelmina Drengwitz
83467edac0 Merge pull request #273 from jeffbyrnes/add-gmt-alias
Add alias & default shortcut for `git mergetool`
2018-09-17 11:25:31 -04:00
Tom "Ravi" Hale
e5da83665a bin_path(): use builtin commands and avoid which 2018-09-14 19:58:25 +07:00
Tom "Ravi" Hale
f85b9a4727 git_show_affected_files: make $f local 2018-09-14 19:58:25 +07:00
Tom "Ravi" Hale
4adf771492 Ensure file ordering matches in both invocations of ls 2018-09-14 19:58:25 +07:00
Tom "Ravi" Hale
e46a7c3309 ls_with_file_shortcuts: fail rather than create incorrect variables
Removes the danger from issue #274.

The proper fix will need to address issue #260.
2018-09-14 19:58:09 +07:00
Tom "Ravi" Hale
80ec1ad2ad Replace built-in shell array quoting with printf %q 2018-09-12 17:57:46 +07:00
Tom "Ravi" Hale
21d155776a Allow run_tests.sh to be executed from anywhere 2018-09-12 15:44:51 +07:00
Jeff Byrnes
8761a4758b Add alias & default shortcut for git mergetool
Provides parity with the `gdt` alias for `git difftool`
2018-09-11 10:36:34 -04:00
Wilhelmina Drengwitz
d1723709f1 Merge pull request #269 from ghthor/revert-status-shortcuts
Revert to legacy status shortcuts ruby script
2018-09-05 12:30:00 -04:00
Willa Drengwitz
1a9411dd4a Revert to legacy status shortcuts ruby script 2018-09-05 12:24:14 -04:00
Tom "Ravi" Hale
a580c53004 ls_with_file_shortcuts: print error to STDERR 2018-09-02 11:34:33 +07:00
Tom "Ravi" Hale
a6eeebfa91 shell_shortcuts.sh: remove unnecessary subshell 2018-09-02 11:34:32 +07:00
Tom "Ravi" Hale
86d9d4b189 shell_shortcuts.sh: fix quoting 2018-09-02 11:34:32 +07:00
Tom "Ravi" Hale
695941b596 Add tests for exec_scmb_expand_args() 2018-09-02 11:34:32 +07:00
Tom "Ravi" Hale
a8092bffd9 Clean up ls_with_file_shortcuts() shwordsplit tests 2018-09-02 11:34:32 +07:00
Tom "Ravi" Hale
f55ce1e6a3 test_ls_with_file_shortcuts: clean up temp files 2018-09-02 11:34:32 +07:00
Tom "Ravi" Hale
0b5a29bbd6 Invoke readlink -f in a way which can succeed 2018-09-02 11:34:32 +07:00
Tom "Ravi" Hale
5a8c2fec12 assert(Not)?Includes: check for failure of _includes
Call _includes and then check its return value.

shunit2 uses the exit code to test, not a string of 0 or 1 as was done
previously.
2018-09-02 11:32:02 +07:00
Tom "Ravi" Hale
ed63b41182 test_helper: Don't clobber global name/email config
Config included by gitconfig [include] is not considered global.

Test git config values without --global to include local config as well.

Change only local config (not global) if needed.
2018-09-02 11:28:47 +07:00
Tom "Ravi" Hale
b193438ca1 shell_shortcuts_test: Unset $QUOTING_STYLE for predictable ls output 2018-09-02 11:28:47 +07:00
Tom "Ravi" Hale
73ed8cb53e scmb_expand_args: return an array to fix quoting issues 2018-09-02 11:28:47 +07:00
Tom "Ravi" Hale
fb7d227c30 Add _safe_eval: quote $@ elements before eval 2018-09-02 11:28:19 +07:00