diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2016-08-21 11:30:39 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2016-08-21 11:30:39 +1200 |
commit | e8cebac781a1aa5ee3f2497452b6cd759abd892f (patch) | |
tree | bffeb82c4d77a29ba24e2a98fbcd682cc23b0cc7 | |
parent | Merge branch 'master' into openbsd (diff) | |
parent | Use terser prompt status flag checks (diff) | |
download | dotfiles-e8cebac781a1aa5ee3f2497452b6cd759abd892f.tar.gz dotfiles-e8cebac781a1aa5ee3f2497452b6cd759abd892f.zip |
Merge branch 'master' into openbsd
-rw-r--r-- | ISSUES.markdown | 18 | ||||
-rw-r--r-- | bash/bashrc.d/prompt.bash | 15 | ||||
-rw-r--r-- | git/gitconfig.m4 | 7 | ||||
-rw-r--r-- | man/man6/acq.6 | 3 |
4 files changed, 17 insertions, 26 deletions
diff --git a/ISSUES.markdown b/ISSUES.markdown index 95402145..9cccdb03 100644 --- a/ISSUES.markdown +++ b/ISSUES.markdown @@ -1,4 +1,5 @@ -Known issues +Known issues issuesW:L + ============ * man(1) completion doesn't work on OpenBSD as manpath(1) isn't a thing on @@ -15,21 +16,6 @@ Known issues git-reflog(1) cals * The \xFF syntax for regex as used in rfct(1) is not POSIX. Need to decide if it's well-supported enough to keep it anyway. -* Git prompt seems to change its mind about file moves after a run of - git-status: - - tom@conan:~/.dotfiles(master)$ git mv bash/bashrc.d/ud.bash sh/shrc.d/ud.sh - tom@conan:~/.dotfiles(master!+)$ git diff --cached - diff --git a/bash/bashrc.d/ud.bash b/sh/shrc.d/ud.sh - similarity index 100% - rename from bash/bashrc.d/ud.bash - rename to sh/shrc.d/ud.sh - tom@conan:~/.dotfiles(master!+)$ - tom@conan:~/.dotfiles(master!+)$ - tom@conan:~/.dotfiles(master!+)$ git status - R bash/bashrc.d/ud.bash -> sh/shrc.d/ud.sh - tom@conan:~/.dotfiles(master+)$ - * On OpenBSD pdksh, including single quotes in comments within command substitution throws "unclosed quote" errors in the linter checks: diff --git a/bash/bashrc.d/prompt.bash b/bash/bashrc.d/prompt.bash index 081cff69..dca34928 100644 --- a/bash/bashrc.d/prompt.bash +++ b/bash/bashrc.d/prompt.bash @@ -122,20 +122,19 @@ prompt() { fi branch=${branch##*/} + # Refresh index so e.g. git-diff-files(1) is accurate + git update-index --refresh >/dev/null + # Collect symbols representing repository state local state - if ! git diff-files --quiet ; then + git diff-files --quiet || state=${state}! - fi - if ! git diff-index --cached --quiet HEAD ; then + git diff-index --cached --quiet HEAD || state=${state}+ - fi - if [[ -n $(git ls-files --others --exclude-standard) ]] ; then + [[ -n $(git ls-files --others --exclude-standard) ]] && state=${state}\? - fi - if git rev-parse --quiet --verify refs/stash >/dev/null ; then + git rev-parse --quiet --verify refs/stash >/dev/null && state=${state}^ - fi # Print the status in brackets; add a git: prefix only if there # might be another VCS prompt (because PROMPT_VCS is set) diff --git a/git/gitconfig.m4 b/git/gitconfig.m4 index 73bdae98..62c58f39 100644 --- a/git/gitconfig.m4 +++ b/git/gitconfig.m4 @@ -1,6 +1,7 @@ [advice] statusHints = false detachedHead = false + implicitIdentity = false pushUpdateRejected = false [alias] @@ -9,6 +10,12 @@ [color] ui = true +[commit] + status = false + +[core] + compression = 9 + [diff] tool = vimdiff diff --git a/man/man6/acq.6 b/man/man6/acq.6 index 78bd6c0e..c3a94d27 100644 --- a/man/man6/acq.6 +++ b/man/man6/acq.6 @@ -10,8 +10,7 @@ How may the stars be prevented from going out? .SH DESCRIPTION .B acq allows you to pose questions to AC, the interplanetary computer. Suggested -topics include the inevitable fate of the universe and whether its ultimate -destruction through entropy is truly inevitable. +topics include the fate of the universe and whether entropy is reversible. .SH SEE ALSO <http://multivax.com/last_question.html> .SH AUTHOR |