upstream/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-09-20 07:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: disable log.showSignature in git log calls

Browse Source
This commit is contained in:
Marc Cornellà 2022-01-10 19:39:05 +01:00
parent 971683762e
commit 9c84c344d7
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
7 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/git/git.plugin.zsh
View File

@ -24,9 +24,7 @@ compdef _git _git_log_prettily=git-log
# Warn if the current branch is a WIP # Warn if the current branch is a WIP
function work_in_progress() { function work_in_progress() {
if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then command git -c log.showSignature=false log -n 1 2>/dev/null | grep -q -- "--wip--" && echo "WIP!!"
echo "WIP!!"
fi
} }
# Check if main exists and use instead of master # Check if main exists and use instead of master

4
themes/Soliah.zsh-theme
View File

@ -45,9 +45,7 @@ function rvm_gemset() {
function git_time_since_commit() { function git_time_since_commit() {
if git rev-parse --git-dir > /dev/null 2>&1; then if git rev-parse --git-dir > /dev/null 2>&1; then
# Only proceed if there is actually a commit. # Only proceed if there is actually a commit.
if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then if last_commit=`git -c log.showSignature=false log --pretty=format:'%at' -1 2> /dev/null`; then
# Get the last commit.
last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
now=`date +%s` now=`date +%s`
seconds_since_last_commit=$((now-last_commit)) seconds_since_last_commit=$((now-last_commit))

2
themes/avit.zsh-theme
View File

@ -31,7 +31,7 @@ function _git_time_since_commit() {
local last_commit now seconds_since_last_commit local last_commit now seconds_since_last_commit
local minutes hours days years commit_age local minutes hours days years commit_age
# Only proceed if there is actually a commit. # Only proceed if there is actually a commit.
if last_commit=$(command git -c log.showSignatures=false log --format='%at' -1 2>/dev/null); then if last_commit=$(command git -c log.showSignature=false log --format='%at' -1 2>/dev/null); then
now=$(date +%s) now=$(date +%s)
seconds_since_last_commit=$((now-last_commit)) seconds_since_last_commit=$((now-last_commit))

4
themes/dogenpunk.zsh-theme
View File

@ -37,9 +37,7 @@ ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
function git_time_since_commit() { function git_time_since_commit() {
if git rev-parse --git-dir > /dev/null 2>&1; then if git rev-parse --git-dir > /dev/null 2>&1; then
# Only proceed if there is actually a commit. # Only proceed if there is actually a commit.
if git log -n 1 > /dev/null 2>&1; then if last_commit=`git -c log.showSignature=false log --pretty=format:'%at' -1 2> /dev/null`; then
# Get the last commit.
last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
now=`date +%s` now=`date +%s`
seconds_since_last_commit=$((now-last_commit)) seconds_since_last_commit=$((now-last_commit))

2
themes/smt.zsh-theme
View File

@ -40,7 +40,7 @@ function git_time_since_commit() {
local last_commit seconds_since_last_commit local last_commit seconds_since_last_commit
# Only proceed if there is actually a commit # Only proceed if there is actually a commit
if ! last_commit=$(command git log --pretty=format:'%at' -1 2>/dev/null); then if ! last_commit=$(command git -c log.showSignature=false log --pretty=format:'%at' -1 2>/dev/null); then
echo "[$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL~%{$reset_color%}]" echo "[$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL~%{$reset_color%}]"
return return
fi fi

4
themes/wedisagree.zsh-theme
View File

@ -69,9 +69,7 @@ function rvm_gemset() {
function git_time_since_commit() { function git_time_since_commit() {
if git rev-parse --git-dir > /dev/null 2>&1; then if git rev-parse --git-dir > /dev/null 2>&1; then
# Only proceed if there is actually a commit. # Only proceed if there is actually a commit.
if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then if last_commit=`git -c log.showSignature=false log --pretty=format:'%at' -1 2> /dev/null`; then
# Get the last commit.
last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
now=`date +%s` now=`date +%s`
seconds_since_last_commit=$((now-last_commit)) seconds_since_last_commit=$((now-last_commit))

2
tools/changelog.sh
View File

@ -414,7 +414,7 @@ function main {
# --first-parent: commits from merged branches are omitted # --first-parent: commits from merged branches are omitted
local SEP="0mZmAgIcSeP" local SEP="0mZmAgIcSeP"
local -a raw_commits local -a raw_commits
raw_commits=(${(0)"$(command git log -z \ raw_commits=(${(0)"$(command git -c log.showSignature=false log -z \
--format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=7 \ --format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=7 \
--no-merges --first-parent $range)"}) --no-merges --first-parent $range)"})