Merge pull request #127 from pawaer/fix/issue126

Replaced grep commit by grep with regex including git sha hash
2025-12-21 12:13:52 +01:00 · 2021-04-29 08:36:34 +02:00 · 2021-04-24 21:50:30 +02:00 · 2021-04-02 19:16:02 +02:00 · 2021-04-02 13:34:46 +02:00
1 changed files with 11 additions and 4 deletions
--- a/15
+++ b/15
@@ -377,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
@@ -408,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 '{
    }
@@ -453,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
@@ -539,7 +546,7 @@ function myDailyStats() {
                       --author="$(git config user.name)" $_merges \
                       --since=$(date "+%Y-%m-%dT00:00:00") \
                       --until=$(date "+%Y-%m-%dT23:59:59") --reverse $_log_options \
-                       | grep commit | wc -l) "commits"
+                       | grep -E "commit [a-f0-9]{40}" | wc -l) "commits"
 }

 ################################################################################
Author	SHA1	Message	Date
Lukáš Mešťan	f5c2b82f02	Merge pull request #127 from pawaer/fix/issue126 Replaced grep commit by grep with regex including git sha hash	2021-04-29 08:36:34 +02:00
Pawaer	bf29c19cf5	Replaced grep commit by grep with regex including git sha hash myDailyStats() used grep commit to detect count of commits. This also increases the count by mentioning commit in the commit message. Therefore a grep with regex is used that expects a 40 digit/char SHA1 hash after the word commit.	2021-04-24 21:50:30 +02:00
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