Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
oh-my-zsh
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
github
oh-my-zsh
Commits
9c84c344
Unverified
Commit
9c84c344
authored
Jan 10, 2022
by
Marc Cornellà
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: disable `log.showSignature` in `git log` calls
parent
97168376
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
15 deletions
+7
-15
git.plugin.zsh
plugins/git/git.plugin.zsh
+1
-3
Soliah.zsh-theme
themes/Soliah.zsh-theme
+1
-3
avit.zsh-theme
themes/avit.zsh-theme
+1
-1
dogenpunk.zsh-theme
themes/dogenpunk.zsh-theme
+1
-3
smt.zsh-theme
themes/smt.zsh-theme
+1
-1
wedisagree.zsh-theme
themes/wedisagree.zsh-theme
+1
-3
changelog.sh
tools/changelog.sh
+1
-1
No files found.
plugins/git/git.plugin.zsh
View file @
9c84c344
...
@@ -24,9 +24,7 @@ compdef _git _git_log_prettily=git-log
...
@@ -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
...
...
themes/Soliah.zsh-theme
View file @
9c84c344
...
@@ -45,9 +45,7 @@ function rvm_gemset() {
...
@@ -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))
...
...
themes/avit.zsh-theme
View file @
9c84c344
...
@@ -31,7 +31,7 @@ function _git_time_since_commit() {
...
@@ -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.showSignature
s
=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))
...
...
themes/dogenpunk.zsh-theme
View file @
9c84c344
...
@@ -37,9 +37,7 @@ ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
...
@@ -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))
...
...
themes/smt.zsh-theme
View file @
9c84c344
...
@@ -40,7 +40,7 @@ function git_time_since_commit() {
...
@@ -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
...
...
themes/wedisagree.zsh-theme
View file @
9c84c344
...
@@ -69,9 +69,7 @@ function rvm_gemset() {
...
@@ -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))
...
...
tools/changelog.sh
View file @
9c84c344
...
@@ -414,7 +414,7 @@ function main {
...
@@ -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
)
"
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment