[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin 68c0d47 414/439: * elpa-admin.el (elpaa--fetch): Don
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin 68c0d47 414/439: * elpa-admin.el (elpaa--fetch): Don't show the log if branches diverged |
Date: |
Sun, 17 Oct 2021 15:48:47 -0400 (EDT) |
branch: elpa-admin
commit 68c0d47bd00d59013f153df0d2ec9131ee3461b4
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* elpa-admin.el (elpaa--fetch): Don't show the log if branches diverged
---
elpa-admin.el | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/elpa-admin.el b/elpa-admin.el
index 82e8e5c..8777c02 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1694,6 +1694,7 @@ More at " (elpaa--default-url pkgname))
(elpaa--spec-get pkg-spec :url)))
(branch (elpaa--branch pkg-spec))
(release-branch (elpaa--spec-get pkg-spec :release-branch))
+ (ortb (elpaa--ortb pkg-spec))
(urtb (elpaa--urtb pkg-spec))
(refspec (if branch (format "+refs/heads/%s:%s" branch urtb)
(format "+HEAD:%s" urtb)))
@@ -1712,6 +1713,11 @@ More at " (elpaa--default-url pkgname))
(if release-refspec
(list release-refspec)))))
(message "Fetch error for %s:\n%s" pkg (buffer-string)))
+ ((and
+ (not (zerop (elpaa--call t "git" "merge-base" "--is-ancestor"
+ ortb urtb)))
+ (elpaa--git-branch-p ortb))
+ (message "Upstream of %s has diverged" pkg))
((let* ((ortb (elpaa--ortb pkg-spec))
(exists (elpaa--git-branch-p ortb)))
(not (equal 0 (elpaa--call t "git" "log"
- [nongnu] elpa-admin 48e4ccf 388/439: * elpa-admin.el: Don't pass non-existing dirs to `bwrap`, (continued)
- [nongnu] elpa-admin 48e4ccf 388/439: * elpa-admin.el: Don't pass non-existing dirs to `bwrap`, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 12cd68f 386/439: * README.org: Update according to comments from RMS., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d56a357 416/439: * elpa-admin.el: Don't hide the log of diverged packages in `fetch/<pkg>`, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin e79cce6 382/439: * elpa-admin.el (elpaa--get-section): Fix fetching from main file, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 2b93ca3 363/439: * elpa-admin.el: Add support for building Texi from Org., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin b776ff9 408/439: * elpa-admin.el (elpaa--prune-old-tarballs): Move the .sig files as well, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 911fbf6 370/439: * GNUmakefile: Try and unbreak "make packages/foo". Still not perfect, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin bdb17b6 409/439: * elpa-admin.el (elpaa--get-devel-version): Don't remove *all* zeroes!, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0fe87ad 380/439: * elpa-admin.el (elpaa--release-email): Usual last minute typo, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 1ee6e0e 383/439: * elpa-admin.el (elpaa--get-section): Use the whole section, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 68c0d47 414/439: * elpa-admin.el (elpaa--fetch): Don't show the log if branches diverged,
Philip Kaludercic <=
- [nongnu] elpa-admin 54ca8ea 415/439: * elpa-admin.el: Don't build release tarballs for pre-release versions, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin fd42057 422/439: Prefer HTTPS to HTTP, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 28b66f7 427/439: * elpa-admin.el (elpaa--get-last-release): Don't return snapshot versions, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 069c128 429/439: Allow testing locally via list-packages, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 6afe3b7 431/439: * elpa-admin.el (elpaa--make-one-tarball): Be a bit more verbose, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 384e805 435/439: * elpa-admin.el (elpaa--sandbox): Default to nil on w32 and macos, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 69118c5 437/439: * elpa-admin.el (elpaa--release-email): Fix thinko, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin e71d294 439/439: * GNUmakefile (packages/%.elc): Use `other-packages` if present, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin e2b9274 266/439: [admin int] Simplify ‘archive--write-pkg-file’ calling convention., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5250761 270/439: * admin/archive-contents.el: Use `git worktree` for externals, Philip Kaludercic, 2021/10/17