Merge pull request #103 from tomice/master

Fix folder excluding pathspec bug #102
2025-12-21 12:13:52 +01:00 · 2020-06-28 12:59:29 +02:00 · 2020-06-27 20:02:50 -04:00 · 2020-05-11 16:15:30 +02:00 · 2020-05-10 15:10:30 -04:00 · 2020-05-10 14:57:09 -04:00
1 changed files with 13 additions and 6 deletions
--- a/19
+++ b/19
@@ -257,7 +257,7 @@ function detailedGitStats() {

    git -c log.showSignature=false log ${_branch} --use-mailmap $_merges --numstat \
        --pretty="format:commit %H%nAuthor: %aN <%aE>%nDate:   %ad%n%n%w(0,4,4)%B%n" \
-        "$_since" "$_until" "$_pathspec" | LC_ALL=C awk '
+        "$_since" "$_until" $_pathspec | LC_ALL=C awk '
        function printStats(author) {
        printf "\t%s:\n", author

@@ -282,7 +282,14 @@ function detailedGitStats() {
        }

        if (first[author] != "") {
-            printf "\t  lines changed: %d\t(%.0f%%)\n", more[author] + less[author], ((more[author] + less[author])/ (more["total"]+ less["total"]) * 100 )
+            if ( ((more["total"] + less["total"]) * 100) > 0) {
+                printf "\t  lines changed: %d\t", more[author] + less[author]
+                printf "(%.0f%%)\n", ((more[author] + less[author]) / \
+                                      (more["total"] + less["total"]) * 100)
+            }
+            else {
+                printf "\t  lines changed: %d\t(0%%)\n", (more[author] + less[author])
+            }
            printf "\t  first commit:  %s\n", first[author]
            printf "\t  last commit:   %s\n", last[author]
        }
@@ -331,7 +338,7 @@ function detailedGitStats() {
 function suggestReviewers() {
    optionPicked "Suggested code reviewers (based on git history):"
    git -c log.showSignature=false log --use-mailmap $_merges "$_since" "$_until" \
-        --pretty=%aN "$_pathspec" | head -n 100 | sort | uniq -c | sort -nr | LC_ALL=C awk '
+        --pretty=%aN $_pathspec | head -n 100 | sort | uniq -c | sort -nr | LC_ALL=C awk '
    { args[NR] = $0; }
    END {
      for (i = 1; i <= NR; ++i) {
@@ -471,7 +478,7 @@ function commitsByHour() {
 function commitsPerDay() {
    optionPicked "Git commits per date:";
    git -c log.showSignature=false log --use-mailmap $_merges "$_since" "$_until" \
-        --date=short --format='%ad' "$_pathspec" | sort | uniq -c
+        --date=short --format='%ad' $_pathspec | sort | uniq -c
 }

 ################################################################################
@@ -536,7 +543,7 @@ function myDailyStats() {
 function contributors() {
    optionPicked "All contributors (sorted by name):"
    git -c log.showSignature=false log --use-mailmap $_merges "$_since" "$_until" \
-        --format='%aN' "$_pathspec" | sort -u | cat -n
+        --format='%aN' $_pathspec | sort -u | cat -n
 }

 ################################################################################
@@ -585,7 +592,7 @@ function changelogs() {
        --use-mailmap \
        $_merges \
        --format="%cd" \
-        --date=short "${_author}" "$_since" "$_until" "$_pathspec" \
+        --date=short "${_author}" "$_since" "$_until" $_pathspec \
        | sort -u -r | head -n $_limit \
        | while read DATE; do
              echo -e "\n[$DATE]"
Author	SHA1	Message	Date
Lukáš Mešťan	3b2f26e85d	Merge pull request #103 from tomice/master Fix folder excluding pathspec bug #102	2020-06-28 12:59:29 +02:00
Tom Ice	93aa829eae	Fix folder excluding pathspec bug #102 * There was an issue with quoting in the pathspec variable where the variable would get mangled when being passed to different parameters during git operations. This change fixes that. Fixes #102	2020-06-27 20:02:50 -04:00
Lukáš Mešťan	1a11540b67	Merge pull request #101 from tomice/master Fix divide by zero error during lines changed calc	2020-05-11 16:15:30 +02:00
Tom Ice	6692ec8aa3	Hotfix for non-GNU awk on macOS	2020-05-10 15:10:30 -04:00
Tom Ice	63eba9f1b8	Fix divide by zero error during lines changed calc * A new feature was implemented to show percentages when displaying detailed stats (menu options 1 and 2, or options -T and -R). However, the calculation during "lines changed" may cause an error within awk stating it cannot divide by zero as there is no check to see if the divisor is larger than zero. This commit attempts to fix that issue, albeit admittedly not in the most elegant way... Fixes #100	2020-05-10 14:57:09 -04:00