Updated GetGitLog to only include own commits

mrusme · Oct 17, 2020 · 0d71ab2 · 0d71ab2
1 parent 25ad96d
commit 0d71ab2
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/z/helpers.go b/z/helpers.go
@@ -134,14 +134,28 @@ func GetISOWeekInMonth(date time.Time) (month int, weeknumber int) {
 
 func GetGitLog(repo string, since time.Time, until time.Time) (string, string, error) {
   var stdout, stderr bytes.Buffer
-
-  cmd := exec.Command("git", "-C", repo, "log", "--since", since.Format("2006-01-02T15:04:05-0700"), "--until", until.Format("2006-01-02T15:04:05-0700"), "--pretty=oneline")
+  cmd := exec.Command("git", "-C", repo, "config", "user.name")
   cmd.Stdout = &stdout
   cmd.Stderr = &stderr
   err := cmd.Run()
   if err != nil {
       return "", "", err
   }
+  gitUserStr, gitUserErrStr := string(stdout.Bytes()), string(stderr.Bytes())
+  if gitUserStr == "" && gitUserErrStr != "" {
+    return gitUserStr, gitUserErrStr, errors.New(gitUserErrStr)
+  }
+
+  stdout.Reset()
+  stderr.Reset()
+
+  cmd = exec.Command("git", "-C", repo, "log", "--author", gitUserStr, "--since", since.Format("2006-01-02T15:04:05-0700"), "--until", until.Format("2006-01-02T15:04:05-0700"), "--pretty=oneline")
+  cmd.Stdout = &stdout
+  cmd.Stderr = &stderr
+  err = cmd.Run()
+  if err != nil {
+      return "", "", err
+  }
 
   stdoutStr, stderrStr := string(stdout.Bytes()), string(stderr.Bytes())
   return stdoutStr, stderrStr, nil