branch: elpa-admin
commit f5f0c4eb94f5fc470dc02a351bca89260759aac5
Author: Stefan Monnier <[email protected]>
Commit: Stefan Monnier <[email protected]>
(elpaa--worktree-sync): Fix bug with funny refspec
* elpa-admin.el (elpaa--worktree-sync): Improve regexp to detect clones
that fetch all branches, so we don't misfire on "unrelated" refspecs
like `+refs/pull/*:refs/remotes/origin/pull-request/*`.
---
elpa-admin.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/elpa-admin.el b/elpa-admin.el
index 9e83630693..bb47cddcf0 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -700,7 +700,7 @@ as well as in the local clone, not upstream."
(let* ((pkg (car pkg-spec))
(basename (format "%s-sync-failure.txt" pkg))
(syncfail-file (expand-file-name basename elpaa--sync-failures-dir)))
- ;; FIXME: Add a link from <PKG>.html to this status report?
+ ;; FIXME: Add a link from <PKG>.html to this status report.
(elpaa--report-failure
pkg-spec metadata
(when (file-exists-p syncfail-file)
@@ -2410,7 +2410,7 @@ If WITH-CORE is non-nil, it means we manage :core
packages as well."
"--get-all" "remote.origin.fetch")
(unless (or (= (point) pos)
(save-excursion
- (re-search-backward "\\*$" pos t)))
+ (search-backward "+refs/heads/*:" pos t)))
(elpaa--call t "git" "remote" "set-branches"
"--add" "origin" branch)
(when (elpaa--spec-get pkg-spec :release-branch)
