Commit Graph

664 Commits

Author SHA1 Message Date
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
Tom "Ravi" Hale
d5c60b2cc5 git_status_shortcuts: don't clobber $IFS 2018-09-01 20:19:57 +07:00
Tom "Ravi" Hale
3a5b7a685a _print_path: remove unnecessary pipeline 2018-09-01 20:14:36 +07:00
Tom "Ravi" Hale
5f286eaaaa Quote arrays to avoid splitting by $IFS 2018-09-01 20:14:36 +07:00
Wilhelmina Drengwitz
8a326c2505 Merge pull request #262 from ghthor/refactor_of_git_status
Refactor of git status, Closes #132
2018-08-31 16:11:14 -04:00
Willa Drengwitz
750697e925 Add quotes around files with spaces 2018-08-31 16:02:39 -04:00
Willa Drengwitz
fc679a06ac Update strip color perl command 2018-08-31 13:53:51 -04:00
Willa Drengwitz
f0ef9b06f6 Add back too status max files check 2018-08-31 13:51:34 -04:00
Willa Drengwitz
e789faa1fd Merge remote-tracking branch 'origin/master' into refactor_of_git_status 2018-08-31 13:24:24 -04:00
Nathan Broadbent
e8a5f775d1 Use "^M" on Zsh and "\n" on Bash 2018-09-01 00:22:33 +07:00
Willa Drengwitz
0acc0223a5 Add legacy status script 2018-08-31 13:22:16 -04:00
Nathan Broadbent
e6b1785910 Revert "Use ^M instead of" - Stick with "\n" for now so that Ctrl + x + space works on bash
This reverts commit 1f3b8a6b11.
2018-08-31 23:53:42 +07:00
Nathan Broadbent
7fcd70adc2 Rename README.markdown => README.md 2018-08-31 23:45:57 +07:00
Nathan Broadbent
f59a255c9c Remove video and GIF from README 2018-08-31 23:45:40 +07:00
Wilhelmina Drengwitz
ce2d6024ac Merge pull request #259 from ghthor/add-git-grep-aliases
[PATCH] Add grep_shortcuts
2018-08-31 09:36:45 -04:00
Wilhelmina Drengwitz
1169402e62 Merge pull request #215 from baumhoto/master
changed alias "gls" due to issue with zsh
2018-08-31 09:35:51 -04:00
David Lee
7189656854 [PATCH] Add grep_shortcuts
Closes #125, Thanks David Lee!
2018-08-31 09:33:37 -04:00
Wilhelmina Drengwitz
413ca62d5c Merge pull request #234 from ghthor/fix-tests
Fix tests
2018-08-31 09:12:18 -04:00
Wilhelmina Drengwitz
77916f056a Add bash & zsh compatible way to resolve abs exe paths 2018-08-31 09:09:46 -04:00
Wilhelmina Drengwitz
6143b31a11 Merge pull request #258 from ghthor/osx-testing
OSX/Darwin testing and compatibility - Retest
2018-08-31 09:03:34 -04:00
Willa Drengwitz
f5850830fa Fix tr illegal command 2018-08-31 09:01:06 -04:00
Willa Drengwitz
89cf0eb6ad Run shfmt 2018-08-31 08:58:41 -04:00