Extract author resolving

Author: raszi

magit-standup.el

@@ -157,16 +157,22 @@ the org link prefix string, or nil for plain text."
               hash)
             rest)))
 
+(defun magit-standup--resolve-author (repo-path)
+  "Return the author string to filter commits by in REPO-PATH.
+Uses `magit-standup-author' if set, otherwise falls back to
+`git config user.email' in REPO-PATH."
+  (let ((default-directory (file-name-as-directory repo-path)))
+    (or magit-standup-author
+        (magit-git-string "config" "user.email")
+        (user-error "Cannot determine author for %s; set `magit-standup-author' or git config user.email" repo-path))))
+
 (defun magit-standup--collect-commits (repo-path since-date)
   "Collect commits from REPO-PATH since SINCE-DATE.
 Returns an alist of (BRANCH-NAME . COMMITS) where COMMITS is a
 list of raw commit strings with hash and message separated by a
-null byte.  The author is determined from `magit-standup-author'
-or `git config user.email' in REPO-PATH."
+null byte."
   (let* ((default-directory (file-name-as-directory repo-path))
-         (author (or magit-standup-author
-                     (magit-git-string "config" "user.email")
-                     (user-error "Cannot determine author for %s; set `magit-standup-author' or git config user.email" repo-path)))
+         (author (magit-standup--resolve-author repo-path))
          (branches (magit-git-lines "branch" "--format=%(refname:short)")))
     (mapcar (lambda (branch)
               (cons branch

test/magit-standup-test.el

@@ -81,40 +81,40 @@
              "/home/user/repo" '("stale-branch"))
             :to-be nil)))
 
-(describe "magit-standup--collect-commits"
-  (it "sets default-directory to the repo path"
-    (let ((magit-standup-author "alice")
-          captured-dirs)
-      (spy-on 'magit-git-lines :and-call-fake
-              (lambda (&rest _)
-                (push default-directory captured-dirs)
-                nil))
-      (magit-standup--collect-commits "/tmp/my-repo" "2026-01-05")
-      (expect captured-dirs :not :to-be nil)
-      (dolist (dir captured-dirs)
-        (expect dir :to-equal "/tmp/my-repo/"))))
-
+(describe "magit-standup--resolve-author"
   (it "uses magit-standup-author when set"
     (let ((magit-standup-author "alice"))
       (spy-on 'magit-git-string)
-      (spy-on 'magit-git-lines :and-return-value nil)
-      (magit-standup--collect-commits "/tmp/repo" "2026-01-05")
+      (magit-standup--resolve-author "/tmp/repo")
       (expect 'magit-git-string :not :to-have-been-called)))
 
   (it "falls back to git config user.email"
     (let ((magit-standup-author nil))
       (spy-on 'magit-git-string :and-return-value "bob@example.com")
-      (spy-on 'magit-git-lines :and-return-value nil)
-      (magit-standup--collect-commits "/tmp/repo" "2026-01-05")
+      (expect (magit-standup--resolve-author "/tmp/repo")
+              :to-equal "bob@example.com")
       (expect 'magit-git-string
               :to-have-been-called-with "config" "user.email")))
 
   (it "signals error when no author can be determined"
     (let ((magit-standup-author nil))
       (spy-on 'magit-git-string :and-return-value nil)
-      (expect (magit-standup--collect-commits "/tmp/repo" "2026-01-05")
+      (expect (magit-standup--resolve-author "/tmp/repo")
               :to-throw 'user-error))))
 
+(describe "magit-standup--collect-commits"
+  (it "sets default-directory to the repo path"
+    (let ((magit-standup-author "alice")
+          captured-dirs)
+      (spy-on 'magit-git-lines :and-call-fake
+              (lambda (&rest _)
+                (push default-directory captured-dirs)
+                nil))
+      (magit-standup--collect-commits "/tmp/my-repo" "2026-01-05")
+      (expect captured-dirs :not :to-be nil)
+      (dolist (dir captured-dirs)
+        (expect dir :to-equal "/tmp/my-repo/")))))
+
 (describe "magit-standup--resolve-repos"
   :var (tmpdir)