Merge pull request #129 from treussart/add_git_branch_option

Add git branch option
Set git branch in options
2025-12-21 12:13:52 +01:00 · 2021-05-19 08:36:00 +02:00 · 2021-05-18 21:51:40 +02:00 · 2021-04-29 08:36:34 +02:00 · 2021-04-24 21:50:30 +02:00
4 changed files with 25 additions and 9 deletions
--- a/README.md
+++ b/README.md
@@ -178,6 +178,14 @@ export _GIT_MERGE_VIEW="enable"
 export _GIT_MERGE_VIEW="exclusive"
 ```

+### Git branch
+
+You can set the variable `_GIT_BRANCH` to set the branch of the stats. Works with commands `--git-stats-by-branch`. 
+
+```bash
+export _GIT_BRANCH="master"
+```
+
 ### Color themes

 You can change to the legacy color scheme by toggling the variable `_MENU_THEME` between `default` and `legacy`
--- a/12
+++ b/12
@@ -61,7 +61,7 @@ fi
 _log_options=${_GIT_LOG_OPTIONS:-}
 if [[ -n "${_log_options}" ]]; then
    _log_options=$_log_options
-else 
+else
    _log_options=""
 fi

@@ -158,7 +158,9 @@ ADDITIONAL USAGE
    You can also set _GIT_MERGE_VIEW to only show merge commits
        ex: export _GIT_MERGE_VIEW=exclusive
    You can set _MENU_THEME to display the legacy color scheme
-        ex: export _MENU_THEME=legacy"
+        ex: export _MENU_THEME=legacy
+    You can set _GIT_BRANCH to set the branch of the stats
+        ex: export _GIT_BRANCH=master"
 }

 ################################################################################
@@ -457,7 +459,7 @@ 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)
@@ -546,7 +548,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"
 }

 ################################################################################
@@ -633,7 +635,7 @@ if [[ "$#" -eq 1 ]]; then
        -r|--suggest-reviewers) suggestReviewers;;
        -T|--detailed-git-stats) detailedGitStats;;
        -R|--git-stats-by-branch)
-            branch=""
+            branch="${_GIT_BRANCH:-}"
            while [[ -z "${branch}" ]]; do
                read -r -p "Which branch? " branch
            done
--- a/git-quick-stats.1
+++ b/git-quick-stats.1
@@ -1,13 +1,13 @@
 .TH git-quick-stats "1" "January 2020" "git-quick-stats" "User Commands"
 .SH NAME
-.B git\-quick\-stats 
+.B git\-quick\-stats
 \- Simple and efficient way to access various stats in a git repository.
 .SH SYNOPSIS
 .PP
-For non\-interactive mode: 
+For non\-interactive mode:
 .B git\-quick\-stats [OPTIONS]
 .PP
-For interactive mode: 
+For interactive mode:
 .B git-quick-stats
 .PP
 .SH DESCRIPTION
@@ -131,6 +131,10 @@ You can also set _GIT_MERGE_VIEW to only show merge commits, example:
 You can switch to the legacy color scheme, example:
 .PP
 .B export _MENU_THEME=legacy
+.PP
+You can set _GIT_BRANCH to set the branch of the stats, example:
+.PP
+.B  export _GIT_BRANCH="master"
 .
 .fi

--- a/tests/commands_test.sh
+++ b/tests/commands_test.sh
@@ -69,7 +69,9 @@ ADDITIONAL USAGE
    You can also set _GIT_MERGE_VIEW to only show merge commits
        ex: export _GIT_MERGE_VIEW=exclusive
    You can set _MENU_THEME to display the legacy color scheme
-        ex: export _MENU_THEME=legacy"
+        ex: export _MENU_THEME=legacy
+    You can set _GIT_BRANCH to set the branch of the stats
+        ex: export _GIT_BRANCH=master"

 assert_raises "$src fail" 1
Author	SHA1	Message	Date
Lukáš Mešťan	5b08bb0b52	Merge pull request #129 from treussart/add_git_branch_option Add git branch option	2021-05-19 08:36:00 +02:00
Matthieu Treussart	08d1a5a6e3	Set git branch in options	2021-05-18 21:51:40 +02:00
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