[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin 5a664e2 091/357: Merge branch 'master' of git+ssh://gi
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin 5a664e2 091/357: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa |
Date: |
Thu, 10 Dec 2020 18:06:21 -0500 (EST) |
branch: elpa-admin
commit 5a664e25b59ba9e2861bb730cd4b59b5ade49bfa
Merge: 480283a bffc4a6
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa
---
admin/archive-contents.el | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 863b13e..aaedd9b 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -471,6 +471,8 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
;;; Maintain external packages.
+(defconst archive--elpa-git-url "git+ssh://git.sv.gnu.org/srv/git/emacs/elpa")
+
(defun archive-add/remove/update-externals ()
(let ((exts (with-current-buffer (find-file-noselect "externals-list")
(goto-char (point-min))
@@ -502,17 +504,9 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(output
(with-temp-buffer
;; FIXME: Use git-new-workdir!
- (call-process "git" nil t nil "branch" "--track"
- branch (concat "origin/" branch))
(call-process "git" nil t nil "clone"
- "--shared" "--branch" branch "../" dir)
- (let ((default-directory (file-name-as-directory
- (expand-file-name dir))))
- ;; (call-process "git" nil t nil "branch"
- ;; "-m" branch "master")
- (call-process "git" nil t nil "remote"
- "set-url" "--push" "origin"
-
"git+ssh://git.sv.gnu.org/srv/git/emacs/elpa.git"))
+ "--reference" ".." "--branch" branch
+ archive--elpa-git-url dir)
(buffer-string))))
(message "Cloning branch %s:\n%s" dir output)))
((not (file-directory-p (concat dir "/.git")))
- [elpa] elpa-admin 2658af9 345/357: * admin/archive-contents.el: Add preliminary code to fetch upstream updates, (continued)
- [elpa] elpa-admin 2658af9 345/357: * admin/archive-contents.el: Add preliminary code to fetch upstream updates, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 21fc443 349/357: * externals-list ("markdown-mode"): New package, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 0c23652 046/357: Revert "Add an explicit OPERATION-MODE "nil" in README's examples", Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 7ce78d5 071/357: Note that 'autogen.sh' should be run to generate 'configure' and 'Makefile.in' (see #11), Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5319f2f 062/357: * archive-contents.el: Make `site' more incrementally., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 988d3f5 059/357: Add a table of contents to README file, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 6011ab7 066/357: Initial import, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin aae2f27 064/357: imported README from googlecode's homepage, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a745b29 076/357: * admin/archive-contents.el: Create web pages., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin b7f2140 081/357: Thanks go to Lars Andersen., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5a664e2 091/357: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa,
Stefan Monnier <=
- [elpa] elpa-admin 1daf0bb 085/357: Merge branch 'master' of github.com:rocky/emacs-loc-changes, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 90851ae 086/357: Get "make -k" to go through, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin e71d997 087/357: Merge remote-tracking branch 'repo.or.cz/elpa', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 87dd559 092/357: Update infrastructure for Git., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin efd0702 098/357: Fix generation of package autoloads, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin e55d6b1 102/357: Sync with yasnippet/master, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 170624f 106/357: Avoid lm-homepage which is not in Emacs-24.3, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 0306c73 111/357: update README, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 7db4e2d 112/357: small updates to README and NOTES, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 29880d4 115/357: Merge branch 'master' of git://bzr.sv.gnu.org/emacs/elpa, Stefan Monnier, 2020/12/10