[elpa] elpa-admin e1ee46b936: * elpa-admin.el (elpaa--push): Only use `ortb` when it exists

[Stefan Monnier]

branch: elpa-admin
commit e1ee46b936e151ab774eaeb260a398808be9a931
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * elpa-admin.el (elpaa--push): Only use `ortb` when it exists
    
    This should hopefully silence unsightly error messages such as:
    
        fatal: Not a valid object name refs/remotes/origin/elpa/thepackage
---
 elpa-admin.el | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 543e111de2..3b1b6008c8 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -2258,16 +2258,19 @@ relative to elpa root."
   (let* ((pkg (car pkg-spec))
          (release-branch (elpaa--spec-get pkg-spec :release-branch))
          (ortb (elpaa--ortb pkg-spec))
+         (ortb-p (elpaa--git-branch-p ortb))
          (urtb (elpaa--urtb pkg-spec)))
     ;; FIXME: Arrange to merge if it's not a fast-forward.
     (with-temp-buffer
       (cond
-       ((zerop (elpaa--call t "git" "merge-base" "--is-ancestor" urtb ortb))
+       ((and ortb-p
+             (zerop (elpaa--call t "git" "merge-base"
+                                 "--is-ancestor" urtb ortb)))
         (message "Nothing to push for %s" pkg))
-       ((and
-         (not (zerop (elpaa--call t "git" "merge-base" "--is-ancestor"
-                                  ortb urtb)))
-         (elpaa--git-branch-p ortb))
+       ((and ortb-p
+             (not (zerop (elpaa--call t "git" "merge-base" "--is-ancestor"
+                                      ortb urtb)))
+             (elpaa--git-branch-p ortb))
         (message "Can't push %s: not a fast-forward" pkg))
        ((equal 0 (apply #'elpaa--call
                         t "git" "push" "--set-upstream"