Release version 2.13.02.13.0

7 files changed, 98 insertions, 30 deletions

diff --git a/Documentation/RelNotes/2.13.0.txt b/Documentation/RelNotes/2.13.0.txt
index e28aba2..cbb07c7 100644
--- a/Documentation/RelNotes/2.13.0.txt
+++ b/Documentation/RelNotes/2.13.0.txt
@@ -1,12 +1,57 @@
-Magit v2.13.0 Release Notes (unreleased)
-========================================
+It's Magit!  A Git Porcelain inside Emacs
+=========================================
 
-Changes since v2.12.0
----------------------
+Magit is a text-based Git user interface that puts an unmatched focus
+on streamlining workflows. Commands are invoked using short mnemonic
+key sequences that take the cursor’s position in the highly actionable
+interface into account to provide context-sensitive behavior.
+
+With Magit you can do nearly everything that you can do when using Git
+on the command-line, but at greater speed and while taking advantage
+of advanced features that previously seemed too daunting to use on a
+daily basis. Many users will find that by using Magit they can become
+more effective Git user.
+
+For more information about Magit, see https://magit.vc
+and https://emacsair.me/2017/09/01/campaign-articles.
+
+Magit v2.13.0 Release Notes
+===========================
+
+Released 2nd June 2018 by Jonas Bernoulli.
+
+I am pleased to announce the release of Magit version 2.13.0,
+representing 166 commits by 18 contributors over two months.
+
+Also see https://emacsair.me/2018/06/02/magit-2.13.
+
+Upcoming breaking changes
+-------------------------
+
+* This is the last release to support Emacs 24.4.  Going forward at
+  least Emacs 25.1 is required.
+
+* This is the last release to support Git 1.9.4.  Going forward at
+  least Git 2.4 is required.
+
+* Many functions and variables that have been declared obsolete for
+  a while now are going to be removed after this release.
+
+All of these changes will happen on "master", the development branch.
+Note that the snapshot packages on Melpa are built from that branch.
+If you cannot update Emacs and/or Git now, then you should pin Magit
+to Melpa-Stable to stick with this release (and bugfix releases) for
+the time being.
+
+Breaking changes
+----------------
 
 * As announced earlier, the obsolete option `magit-no-confirm-default'
   has been removed.  #3232
 
+Changes since v2.12.0
+---------------------
+
 * Augmenting a file- or blob-visiting buffer with blame information
   was completely rewritten, making the implementation more robust and
   adding many new features.  It is now possible blame in order to get
@@ -67,5 +112,28 @@ Fixes since v2.12.0
 * Time zones were not handled correctly when calculating times for
   blame headings.  #3443
 
-This release also contains other minor improvements, bug fixes, typo
-fixes, and documentation fixes.
+This release also contains the fixes described in the v2.12.1 release
+notes, as well as other minor improvements, bug fixes, typo fixes, and
+documentation fixes.
+
+Authors
+-------
+
+   138  Jonas Bernoulli
+     6  Kyle Meyer
+     2  Alban Gruin
+     2  Basil L. Contovounesios
+     2  Buster Copley
+     2  Christophe Junke
+     2  Mario Rodas
+     2  Phil Sainty
+     1  Aaron Madlon-Kay
+     1  Ben North
+     1  Dean Kariniemi
+     1  Eli Barzilay
+     1  Jon Vanderwijk
+     1  Jonathan Leech-Pepin
+     1  Justin Guenther
+     1  Li-Yun Chang
+     1  Marc Sherry
+     1  Noam Postavsky
diff --git a/Documentation/magit.org b/Documentation/magit.org
index d9058f3..fa8f294 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.12.1 (2.12.1-149-g8a758dbb+1)
+#+SUBTITLE: for version 2.13.0
 #+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.12.1 (2.12.1-149-g8a758dbb+1).
+This manual is for Magit version 2.13.0.
 
 #+BEGIN_QUOTE
 Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index 251a6b0..444ef71 100644
--- a/Documentation/magit.texi
+++ b/Documentation/magit.texi
@@ -30,7 +30,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit User Manual
-@subtitle for version 2.12.1 (2.12.1-149-g8a758dbb+1)
+@subtitle for version 2.13.0
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -52,7 +52,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.12.1 (2.12.1-149-g8a758dbb+1).
+This manual is for Magit version 2.13.0.
 
 @quotation
 Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
diff --git a/RelNotes b/RelNotes
index d09c3d5..125bf78 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.12.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.13.0.txt
\ No newline at end of file
diff --git a/default.mk b/default.mk
index 5bf3ceb..c06f2ad 100644
--- a/default.mk
+++ b/default.mk
@@ -91,20 +91,20 @@ ELGS = magit-autoloads.el magit-version.el
 
 VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0)
 
-ASYNC_VERSION       = 1.9.2
-DASH_VERSION        = 2.13.0
-GHUB_VERSION        = 2.0.0
-GIT_COMMIT_VERSION  = 2.12.0
+ASYNC_VERSION       = 1.9.3
+DASH_VERSION        = 2.14.1
+GHUB_VERSION        = 2.0.1
+GIT_COMMIT_VERSION  = 2.12.1
 LET_ALIST_VERSION   = 1.0.5
 MAGIT_POPUP_VERSION = 2.12.3
-WITH_EDITOR_VERSION = 2.7.2
-
-ASYNC_MELPA_SNAPSHOT       = 20170823
-DASH_MELPA_SNAPSHOT        = 20170810
-GHUB_MELPA_SNAPSHOT        = 20180328
-GIT_COMMIT_MELPA_SNAPSHOT  = 20180329
-MAGIT_POPUP_MELPA_SNAPSHOT = 20180329
-WITH_EDITOR_MELPA_SNAPSHOT = 20180318
+WITH_EDITOR_VERSION = 2.7.3
+
+ASYNC_MELPA_SNAPSHOT       = 20180527
+DASH_MELPA_SNAPSHOT        = 20180413
+GHUB_MELPA_SNAPSHOT        = 20180417
+GIT_COMMIT_MELPA_SNAPSHOT  = 20180411
+MAGIT_POPUP_MELPA_SNAPSHOT = 20180509
+WITH_EDITOR_MELPA_SNAPSHOT = 20180414
 
 EMACS_VERSION = 24.4
 
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 5fa5276..2df072c 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -11,7 +11,7 @@
 ;;	Marius Vollmer <marius.vollmer@gmail.com>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
-;; Package-Requires: ((emacs "24.4") (dash "20170810") (with-editor "20180318"))
+;; 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 eedb33a..6e389d9 100644
--- a/lisp/magit-pkg.el
+++ b/lisp/magit-pkg.el
@@ -1,10 +1,10 @@
 (define-package "magit" "2.12.0"
   "A Git porcelain inside Emacs."
   '((emacs "24.4")
-    (async "20170823")
-    (dash "20170810")
-    (ghub "20180328")
-    (git-commit "20180329")
+    (async "1.9.3")
+    (dash "2.14.1")
+    (ghub "2.0.1")
+    (git-commit "2.12.1")
     (let-alist "1.0.5")
-    (magit-popup "20180329")
-    (with-editor "20180318")))
+    (magit-popup "2.12.3")
+    (with-editor "2.7.3")))