Merge pull request #125 from arzzen/fix/issue-123

fix shortlog filter
2025-12-21 12:13:52 +01:00 · 2021-04-02 19:16:02 +02:00 · 2021-04-02 13:34:46 +02:00 · 2021-03-31 17:31:28 +02:00 · 2021-03-31 10:33:25 -04:00 · 2021-02-24 08:14:12 +01:00
2 changed files with 13 additions and 9 deletions
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020 Lukáš Mešťan
+Copyright (c) 2021 Lukáš Mešťan

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/20
+++ b/20
@@ -224,12 +224,9 @@ showMenu() {
 # OUTS: None
 ################################################################################
 function optionPicked() {
-    local -r bold=$(tput bold)
-    local -r red=$(tput setaf 1)
-    local -r reset=$(tput sgr0)
-    local msg=${*:-"${reset}Error: No message passed"}
+    local msg=${*:-"Error: No message passed"}

-    echo -e "${bold}${red}${msg}${reset}\n"
+    echo -e "${msg}\n"
 }

 ################################################################################
@@ -380,11 +377,13 @@ function jsonOutput() {
 function commitsByMonth() {
    optionPicked "Git commits by month:"
    echo -e "\tmonth\tsum"
+    local startYear=$(echo "$_since" | grep -Eo "[0-9]{4}")
+    local endYear=$(echo "$_until" | grep -Eo "[0-9]{4}")
    for i in Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec
    do
        echo -en "\t$i\t"
        git -c log.showSignature=false shortlog -n $_merges --format='%ad %s' \
-            "$_since" "$_until" $_log_options | grep " $i " | wc -l
+            "$_since" "$_until" $_log_options | grep -E "($startYear|$endYear)" | grep " $i " | wc -l
    done | awk '{
        count[$1] = $2
        total += $2
@@ -411,12 +410,14 @@ function commitsByMonth() {
 function commitsByWeekday() {
    optionPicked "Git commits by weekday:"
    echo -e "\tday\tsum"
+    local startYear=$(echo "$_since" | grep -Eo "[0-9]{4}")
+    local endYear=$(echo "$_until" | grep -Eo "[0-9]{4}")
    local counter=1
    for i in Mon Tue Wed Thu Fri Sat Sun
    do
        echo -en "\t$counter\t$i\t"
        git -c log.showSignature=false shortlog -n $_merges --format='%ad %s' \
-            "$_since" "$_until" $_log_options | grep "$i " | wc -l
+            "$_since" "$_until" $_log_options | grep -E "($startYear|$endYear)" | grep "$i " | wc -l
        counter=$((counter+1))
    done | awk '{
    }
@@ -456,11 +457,14 @@ function commitsByHour() {
        _author="--author=${author}"
    fi
    echo -e "\thour\tsum"
+    
+    local startYear=$(echo "$_since" | grep -Eo "[0-9]{4}")
+    local endYear=$(echo "$_until" | grep -Eo "[0-9]{4}")
    for i in $(seq -w 0 23)
    do
        echo -ne "\t$i\t"
            git -c log.showSignature=false shortlog -n $_merges --format='%ad %s' \
-                "${_author}" "$_since" "$_until" $_log_options | grep ' '$i: | wc -l
+                "${_author}" "$_since" "$_until" $_log_options | grep -E "($startYear|$endYear)" | grep ' '$i: | wc -l
    done | awk '{
        count[$1] = $2
        total += $2
Author	SHA1	Message	Date
Lukáš Mešťan	c6cb74a5e0	Merge pull request #125 from arzzen/fix/issue-123 fix shortlog filter	2021-04-02 19:16:02 +02:00
arzzen	3f0befcd07	fix shortlog filter	2021-04-02 13:34:46 +02:00
Lukáš Mešťan	292876846d	Merge pull request #124 from tomice/master Fix escape sequences when outputting to non-TTYs	2021-03-31 17:31:28 +02:00
Tom Ice	e70c288225	Fix escape sequences when outputting to non-TTYs * When performing actions such as redirecting the stats to a file, the terminal escape sequences for handling colors gets added to the top message in the text file. While running commands such as sed can fix this, it is inconvenient for users wishing to redirect or pipe the stats in a clean way. Attempting to use test -t yielded some unexpected results, as well as extra logic for handling a non-tty case, so for now, we are simply removing the colors from the message so it defaults to standard terminal colors and formatting Fixes #122	2021-03-31 10:33:25 -04:00
Lukáš Mešťan	4d2621b084	Update LICENSE bump year	2021-02-24 08:14:12 +01:00