From 6b7558c3f95fd6c5173d5fe947363b7b3d5e9cad Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 8 Nov 2018 14:36:44 +0100 Subject: Release version 2.13.1 --- Documentation/RelNotes/2.13.1.txt | 34 ++++++++++++++++++++++++++++++++++ Documentation/RelNotes/2.90.0.org | 3 --- Documentation/magit.org | 4 ++-- Documentation/magit.texi | 6 ++++-- lisp/git-commit.el | 2 +- lisp/magit-pkg.el | 14 +++++++------- 6 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 Documentation/RelNotes/2.13.1.txt delete mode 100644 Documentation/RelNotes/2.90.0.org diff --git a/Documentation/RelNotes/2.13.1.txt b/Documentation/RelNotes/2.13.1.txt new file mode 100644 index 0000000..3447dab --- /dev/null +++ b/Documentation/RelNotes/2.13.1.txt @@ -0,0 +1,34 @@ +Magit v2.13.1 Release Notes +=========================== + +Fixes since v2.13.0 +------------------- + +* The prompt used by `magit-rebase-interactive-assert' was wrong. + 37d76f409 + +* `magit-rebase-autosquash' asked for confirmation when the user + already confirmed earlier. 02e6c75b6 + +* `magit-log-wash-rev` errored in ~magit-cherry-mode~, starting with + Emacs 26.1. 1ee577b35 + +* Magit used a completion function to make the built-in completion + respect the collection's order. Even though that wasn't necessary + for Ivy and Helm it did the same here, which became a problem when a + change in Helm caused fuzzy completion to break in combination with + a completion function. Likewise a change in Ivy caused Magit's sort + order to be ignored, which we work around now. #3476, #3477 + +* When using cygwin, then `git-commit-setup-font-lock' could end up + trying to run git in a non-existent directory. #3505 + +* `magit-insert-modules-unpushed-to-pushremote' failed to insert + anything due to a typo in the used commit range. d4e159f35 + +Authors +------- + + 11 Jonas Bernoulli + 8 Kyle Meyer + 5 Noam Postavsky diff --git a/Documentation/RelNotes/2.90.0.org b/Documentation/RelNotes/2.90.0.org deleted file mode 100644 index ea55685..0000000 --- a/Documentation/RelNotes/2.90.0.org +++ /dev/null @@ -1,3 +0,0 @@ -* Magit v2.90.0 Release Notes (unreleased) -** Changes since v2.13.0 -** Fixes since v2.13.0 diff --git a/Documentation/magit.org b/Documentation/magit.org index fa8f294..359829d 100644 --- a/Documentation/magit.org +++ b/Documentation/magit.org @@ -7,7 +7,7 @@ #+TEXINFO_DIR_CATEGORY: Emacs #+TEXINFO_DIR_TITLE: Magit: (magit). #+TEXINFO_DIR_DESC: Using Git from Emacs with Magit. -#+SUBTITLE: for version 2.13.0 +#+SUBTITLE: for version 2.13.1 #+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings #+TEXINFO_DEFFN: t @@ -22,7 +22,7 @@ directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. #+TEXINFO: @noindent -This manual is for Magit version 2.13.0. +This manual is for Magit version 2.13.1. #+BEGIN_QUOTE Copyright (C) 2015-2018 Jonas Bernoulli diff --git a/Documentation/magit.texi b/Documentation/magit.texi index 444ef71..1fab934 100644 --- a/Documentation/magit.texi +++ b/Documentation/magit.texi @@ -19,6 +19,7 @@ This document is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@. See the GNU General Public License for more details. + @end quotation @end copying @@ -30,7 +31,7 @@ General Public License for more details. @finalout @titlepage @title Magit User Manual -@subtitle for version 2.13.0 +@subtitle for version 2.13.1 @author Jonas Bernoulli @page @vskip 0pt plus 1filll @@ -52,7 +53,7 @@ directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. @noindent -This manual is for Magit version 2.13.0. +This manual is for Magit version 2.13.1. @quotation Copyright (C) 2015-2018 Jonas Bernoulli @@ -66,6 +67,7 @@ This document is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@. See the GNU General Public License for more details. + @end quotation @end ifnottex diff --git a/lisp/git-commit.el b/lisp/git-commit.el index 5638af8..70adfe5 100644 --- a/lisp/git-commit.el +++ b/lisp/git-commit.el @@ -11,7 +11,7 @@ ;; Marius Vollmer ;; Maintainer: Jonas Bernoulli -;; Package-Requires: ((emacs "24.4") (dash "20180413") (with-editor "20180414")) +;; Package-Requires: ((emacs "24.4") (dash "2.14.1") (with-editor "2.7.3")) ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el index fa1c368..34143c1 100644 --- a/lisp/magit-pkg.el +++ b/lisp/magit-pkg.el @@ -1,10 +1,10 @@ -(define-package "magit" "2.13.0" +(define-package "magit" "2.13.1" "A Git porcelain inside Emacs." '((emacs "24.4") - (async "20180527") - (dash "20180413") - (ghub "20180417") - (git-commit "20180602") + (async "1.9.3") + (dash "2.14.1") + (ghub "2.0.1") + (git-commit "2.13.0") (let-alist "1.0.5") - (magit-popup "20180509") - (with-editor "20180414"))) + (magit-popup "2.12.3") + (with-editor "2.7.3"))) -- cgit v1.0