branch: elpa-admin
commit d47f83fc3a66ab03dc36b590622dea9b94c7cb2b
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
* elpa-admin.el (elpaa--fetch): Use the default branch rather than "master"
---
README | 8 ++++----
elpa-admin.el | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/README b/README
index cb295c5..3bb95b9 100644
--- a/README
+++ b/README
@@ -59,7 +59,7 @@ It can be a single file name or a list of file names.
** =:branch BRANCH=
Specifies the branch to follow in the upstream Git repository, in case
-it should be different from =master=.
+it should be different from the default branch.
** =:main-file FILE=
Gives the name of the main file of the package, i.e. the file in which
@@ -277,11 +277,11 @@ The instructions below are for those maintainers who
prefer to use a dedicated
repository or branch for the package or for largish packages.
In any case, a copy of the code is kept in the =elpa.git= repository
-(not in the =master= branch) and should be sync'd with the
+(not in the default branch) and should be sync'd with the
upstream every once in a while. This copy may include local changes,
although these should be kept to a minimum.
-The copy of the code is not kept in =master= but in the
+The copy of the code is not kept in the default branch but in the
=elpa/<pkg-name>= branch in the =elpa.git= repository.
To add a new external package, first add this =elpa.git= repository as a
@@ -309,7 +309,7 @@ Then edit the =elpa-packages= file as mentioned above, add
the line
("realgud-ipdb" :url "https://github.com/realgud/realgud-ipdb";)
#+end_src
-and push that change to the master branch of =elpa=. After it's added to
+and push that change to the default branch of =elpa=. After it's added to
the =elpa-packages= file, the package can be maintained just by
pushing changes to the =elpa/<pkgname>= branch.
diff --git a/elpa-admin.el b/elpa-admin.el
index db6c3d9..a88273c 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1460,8 +1460,8 @@ More at " (elpaa--default-url pkgname))
(branch (elpaa--branch pkg-spec))
(release-branch (elpaa--spec-get pkg-spec :release-branch))
(urtb (elpaa--urtb pkg-spec))
- ;; FIXME: Don't hardcode "master" here.
- (refspec (format "+refs/heads/%s:%s" (or branch "master") urtb))
+ (refspec (if branch (format "+refs/heads/%s:%s" branch urtb)
+ (format "+HEAD:%s" urtb)))
(release-refspec (if release-branch
(format "+refs/heads/%s:%s"
release-branch
