1 files changed, 35 insertions, 0 deletions

diff --git a/test/lisp/vc/vc-git-tests.el b/test/lisp/vc/vc-git-tests.el
index fe55cc75d6f..9721cc4d4ff 100644
--- a/test/lisp/vc/vc-git-tests.el
+++ b/test/lisp/vc/vc-git-tests.el
@@ -194,4 +194,39 @@ is absent."
               ("Tracking" . ,main-branch)
               ("Remote"   . "none (tracking local branch)")))))))))
 
+(ert-deftest vc-git-test-branch-remotes ()
+  "Test behavior of `vc-git--branch-remotes'."
+  (skip-unless (executable-find vc-git-program))
+  (vc-git-test--with-repo repo
+    (let ((main-branch (vc-git-test--start-branch)))
+      (should (null (vc-git--branch-remotes)))
+      (vc-git--out-ok "config"
+                      (format "branch.%s.remote" main-branch)
+                      "origin")
+      (should (null (vc-git--branch-remotes)))
+      (vc-git--out-ok "config"
+                      (format "branch.%s.merge" main-branch)
+                      main-branch)
+      (let ((alist (vc-git--branch-remotes)))
+        (should (assq 'upstream alist))
+        (should (null (assq 'push alist))))
+      (vc-git--out-ok "config"
+                      (format "branch.%s.pushRemote" main-branch)
+                      "fork")
+      (let ((alist (vc-git--branch-remotes)))
+        (should (assq 'upstream alist))
+        (should (equal (cdr (assq 'push alist))
+                       (concat "fork/" main-branch))))
+      (vc-git--out-ok "config" "--unset"
+                      (format "branch.%s.pushRemote" main-branch))
+      (vc-git--out-ok "config" "remote.pushDefault" "fork")
+      (let ((alist (vc-git--branch-remotes)))
+        (should (assq 'upstream alist))
+        (should (equal (cdr (assq 'push alist))
+                       (concat "fork/" main-branch))))
+      (vc-git--out-ok "config" "remote.pushDefault" "origin")
+      (let ((alist (vc-git--branch-remotes)))
+        (should (assq 'upstream alist))
+        (should (null (assq 'push alist)))))))
+
 ;;; vc-git-tests.el ends here