Fix: ("git diff") Don't run if no merge-base ref

Fixes #151. Thanks to Aaron Zeng (@bcc32) for reporting.
alphapapa · Aug 19, 2023 · 50ebda9 · 50ebda9
1 parent b09bef6
commit 50ebda9
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/magit-todos.el b/magit-todos.el
@@ -1375,11 +1375,12 @@ When SYNC is non-nil, match items are returned."
   :command (progn
              ;; Silence byte-compiler warnings about these vars we don't use in this scanner.
              (ignore search-regexp-elisp search-regexp-pcre extra-args directory depth)
-             (list "git" "--no-pager" "diff" "--no-color" "-U0"
-                   (-> "git merge-base HEAD "
-                       (concat magit-todos-branch-list-merge-base-ref)
-                       shell-command-to-string
-                       string-trim)))
+             (let ((merge-base-ref (-> "git merge-base HEAD "
+                                       (concat magit-todos-branch-list-merge-base-ref)
+                                       shell-command-to-string
+                                       string-trim)))
+               (unless (string-empty-p merge-base-ref)
+                 (list "git" "--no-pager" "diff" "--no-color" "-U0" merge-base-ref))))
   :callback 'magit-todos--git-diff-callback)
 
 (magit-todos-defscanner "find|grep"