From 9c84c344d762b200de7acc794b9a0e7832144e7a Mon Sep 17 00:00:00 2001
From: Marc Cornellà <hello@mcornella.com>
Date: Mon, 10 Jan 2022 19:39:05 +0100
Subject: fix: disable `log.showSignature` in `git log` calls
---
plugins/git/git.plugin.zsh | 4 +---
themes/Soliah.zsh-theme | 4 +---
themes/avit.zsh-theme | 2 +-
themes/dogenpunk.zsh-theme | 4 +---
themes/smt.zsh-theme | 2 +-
themes/wedisagree.zsh-theme | 4 +---
tools/changelog.sh | 2 +-
7 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 648fa0a33..8f7e623ec 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -24,9 +24,7 @@ compdef _git _git_log_prettily=git-log
# Warn if the current branch is a WIP
function work_in_progress() {
- if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
- echo "WIP!!"
- fi
+ command git -c log.showSignature=false log -n 1 2>/dev/null | grep -q -- "--wip--" && echo "WIP!!"
}
# Check if main exists and use instead of master
diff --git a/themes/Soliah.zsh-theme b/themes/Soliah.zsh-theme
index 070c54981..c3dd6af89 100644
--- a/themes/Soliah.zsh-theme
+++ b/themes/Soliah.zsh-theme
@@ -45,9 +45,7 @@ function rvm_gemset() {
function git_time_since_commit() {
if git rev-parse --git-dir > /dev/null 2>&1; then
# Only proceed if there is actually a commit.
- if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
- # Get the last commit.
- last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+ if last_commit=`git -c log.showSignature=false log --pretty=format:'%at' -1 2> /dev/null`; then
now=`date +%s`
seconds_since_last_commit=$((now-last_commit))
diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index d117c4e94..f90ba331b 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -31,7 +31,7 @@ function _git_time_since_commit() {
local last_commit now seconds_since_last_commit
local minutes hours days years commit_age
# 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)
seconds_since_last_commit=$((now-last_commit))
diff --git a/themes/dogenpunk.zsh-theme b/themes/dogenpunk.zsh-theme
index 6a9921288..923ca74bc 100644
--- a/themes/dogenpunk.zsh-theme
+++ b/themes/dogenpunk.zsh-theme
@@ -37,9 +37,7 @@ ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
function git_time_since_commit() {
if git rev-parse --git-dir > /dev/null 2>&1; then
# Only proceed if there is actually a commit.
- if git log -n 1 > /dev/null 2>&1; then
- # Get the last commit.
- last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+ if last_commit=`git -c log.showSignature=false log --pretty=format:'%at' -1 2> /dev/null`; then
now=`date +%s`
seconds_since_last_commit=$((now-last_commit))
diff --git a/themes/smt.zsh-theme b/themes/smt.zsh-theme
index 7f54472c6..52e6d9a21 100644
--- a/themes/smt.zsh-theme
+++ b/themes/smt.zsh-theme
@@ -40,7 +40,7 @@ function git_time_since_commit() {
local last_commit seconds_since_last_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%}]"
return
fi
diff --git a/themes/wedisagree.zsh-theme b/themes/wedisagree.zsh-theme
index 07006ecd9..e9e9d6ef8 100644
--- a/themes/wedisagree.zsh-theme
+++ b/themes/wedisagree.zsh-theme
@@ -69,9 +69,7 @@ function rvm_gemset() {
function git_time_since_commit() {
if git rev-parse --git-dir > /dev/null 2>&1; then
# Only proceed if there is actually a commit.
- if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
- # Get the last commit.
- last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+ if last_commit=`git -c log.showSignature=false log --pretty=format:'%at' -1 2> /dev/null`; then
now=`date +%s`
seconds_since_last_commit=$((now-last_commit))
diff --git a/tools/changelog.sh b/tools/changelog.sh
index 664f34608..86774a7ea 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -414,7 +414,7 @@ function main {
# --first-parent: commits from merged branches are omitted
local SEP="0mZmAgIcSeP"
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 \
--no-merges --first-parent $range)"})
--
cgit v1.2.3-70-g09d2