Commit d13ae06f authored by Remi Vanicat's avatar Remi Vanicat

New upstream version 2.90.1

parents c6a94c89 791901b2
......@@ -50,6 +50,7 @@ Contributors
- Alban Gruin <alban@pa1ch.fr>
- Aleksey Uimanov <s9gf4ult@gmail.com>
- Alexander Gramiak <fice-t@protonmail.com>
- Alex Branham <alex.branham@gmail.com>
- Alex Dunn <adunn@ucsb.edu>
- Alexey Voinov <alexey.v.voinov@gmail.com>
- Alex Kost <alezost@gmail.com>
......@@ -154,6 +155,7 @@ Contributors
- Joakim Jalap <JOJA@stoneridge.com>
- Johann Klähn <kljohann@gmail.com>
- John Mastro <john.b.mastro@gmail.com>
- John Morris <john@zultron.com>
- John Wiegley <johnw@newartisans.com>
- Jonas Bernoulli <jonas@bernoul.li>
- Jonathan Leech-Pepin <jonathan.leechpepin@gmail.com>
......@@ -170,6 +172,7 @@ Contributors
- Kan-Ru Chen <kanru@kanru.info>
- Kenny Ballou <kballou@devnulllabs.io>
- Keshav Kini <keshav.kini@gmail.com>
- Kevin Brubeck Unhammer <unhammer@fsfe.org>
- Kévin Le Gouguec <kevin.legouguec@gmail.com>
- Kimberly Wolk <kimwolk@hotmail.com>
- Kyle Meyer <kyle@kyleam.com>
......
* Magit v2.90.1 Release Notes
** Changes since v2.90.0
- Added ~bug-reference-mode~ to ~git-commit-setup-hook~. e19e8fb1e
- The "Version" column in ~magit-submodule-list-mode~ and
~magit-repolist-mode~ buffers now shows when a repository is dirty.
0b86dbfd6
- Added new command ~magit-log-merged~. This command requires
~git-when-merged~ (https://github.com/mhagger/git-when-merged). It
isn't bound in ~magit-log-popup~ by default. To add it, you can use
something like
#+BEGIN_SRC emacs-lisp
(magit-define-popup-action 'magit-log-popup
?m "Log commit's merge" 'magit-log-merged)
#+END_SRC
#3657
** Fixes since v2.90.0
- Bumped the minimal required version of ~git-commit~ to the correct
version. e9bd33758
- Dropped the new "v" prefix that we started to add to release tags
starting with the previous release in places where that prefix is
undesirable. f441cf6d7
- Staging and unstaging submodules while ~diff.submodule~'s value is ~log~
broke shortly before the v2.90.0 release. #3654
* Authors
10 Jonas Bernoulli
1 Allen Li
1 Kevin Brubeck Unhammer
1 Kyle Meyer
* Magit v2.91.0 Release Notes (unreleased)
** Breaking changes
** Changes since v2.90.0
- Added ~bug-reference-mode~ to ~git-commit-setup-hook~. e19e8fb1e
- The "Version" column in ~magit-submodule-list-mode~ and
~magit-repolist-mode~ buffers now shows when a repository is dirty.
0b86dbfd6
- Added new command ~magit-log-merged~. This command requires
~git-when-merged~ (https://github.com/mhagger/git-when-merged). It
isn't bound in ~magit-log-popup~ by default. To add it, you can use
something like
#+BEGIN_SRC emacs-lisp
(magit-define-popup-action 'magit-log-popup
?m "Log commit's merge" 'magit-log-merged)
#+END_SRC
#3657
** Fixes since v2.90.0
- Bumped the minimal required version of ~git-commit~ to the correct
version. e9bd33758
- Dropped the new "v" prefix that we started to add to release tags
starting with the previous release in places where that prefix is
undesirable. f441cf6d7
- Staging and unstaging submodules while ~diff.submodule~'s value is ~log~
broke shortly before the v2.90.0 release. #3654
......@@ -8,7 +8,7 @@
#+TEXINFO_DIR_CATEGORY: Emacs
#+TEXINFO_DIR_TITLE: Magit: (magit).
#+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
#+SUBTITLE: for version 2.90.0
#+SUBTITLE: for version 2.90.1
#+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings
#+TEXINFO_DEFFN: t
......@@ -23,7 +23,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.90.0.
This manual is for Magit version 2.90.1.
#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
......@@ -2999,7 +2999,7 @@ These commands are available in diff buffers.
- ~all~ Show related local and remote branches.
- ~mixed~ Show all containing branches and local merged branches.
- User Option: magit-revision-show-gravatar
- User Option: magit-revision-show-gravatars
Whether to show gravatar images in revision buffers.
......
......@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit User Manual
@subtitle for version 2.90.0
@subtitle for version 2.90.1
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
......@@ -53,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.90.0.
This manual is for Magit version 2.90.1.
@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
......@@ -4085,7 +4085,7 @@ Whether to show related branches in revision buffers.
@end itemize
@end defopt
@defopt magit-revision-show-gravatar
@defopt magit-revision-show-gravatars
Whether to show gravatar images in revision buffers.
......
Documentation/RelNotes/2.90.0.org
\ No newline at end of file
Documentation/RelNotes/2.90.1.org
\ No newline at end of file
......@@ -96,12 +96,12 @@ ELGS = magit-autoloads.el magit-version.el
## Versions ##########################################################
VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0)
VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0 | cut -c2-)
ASYNC_VERSION = 1.9.3
DASH_VERSION = 2.14.1
GHUB_VERSION = 3.0.0
GIT_COMMIT_VERSION = 2.13.0
GIT_COMMIT_VERSION = 2.90.0
MAGIT_POPUP_VERSION = 2.12.4
WITH_EDITOR_VERSION = 2.8.0
......
......@@ -175,6 +175,7 @@ The major mode configured here is turned on by the minor mode
git-commit-setup-changelog-support
git-commit-turn-on-auto-fill
git-commit-propertize-diff
bug-reference-mode
with-editor-usage-message)
"Hook run at the end of `git-commit-setup'."
:group 'git-commit
......
......@@ -208,10 +208,10 @@ so causes the change to be applied to the index as well."
(magit-refresh))))
(defun magit-apply--get-selection ()
(or (magit-region-sections '(hunk file) t)
(or (magit-region-sections '(hunk file module) t)
(let ((section (magit-current-section)))
(pcase (oref section type)
((or `hunk `file) section)
((or `hunk `file `module) section)
((or `staged `unstaged `untracked
`stashed-index `stashed-worktree `stashed-untracked)
(oref section children))
......
......@@ -753,6 +753,27 @@ active, restrict the log to the lines that the region touches."
(goto-char pos)
(call-interactively #'magit-log-trace-definition)))))
;;;###autoload
(defun magit-log-merged (commit branch &optional args files)
"Show log for the merge of COMMIT into BRANCH.
More precisely, find merge commit M that brought COMMIT into
BRANCH, and show the log of the range \"M^..M\". This command
requires git-when-merged, which is available from
https://github.com/mhagger/git-when-merged."
(interactive
(append (let ((commit (magit-read-branch-or-commit "Commit")))
(list commit
(magit-read-other-branch "Merged into" commit)))
(magit-log-arguments)))
(unless (executable-find "git-when-merged")
(user-error "This command requires git-when-merged (%s)"
"https://github.com/mhagger/git-when-merged"))
(magit-git-log
(list (or (magit-git-string "when-merged" "--show-branch" commit branch)
(user-error "Could not find when %s was merged into %s"
commit branch)))
args files))
(defun magit-git-reflog (ref args)
(require 'magit)
(magit-mode-setup #'magit-reflog-mode ref args))
......
......@@ -137,7 +137,7 @@ branch, then also remove the respective remote branch."
(defun magit--merge-absort (branch args)
(when (equal branch "master")
(unless (yes-or-no-p
"Do you really want to to merge `master' into another branch? ")
"Do you really want to merge `master' into another branch? ")
(user-error "Abort")))
(if-let ((target (magit-get-push-branch branch t)))
(progn
......
(define-package "magit" "2.90.0"
(define-package "magit" "2.90.1"
"A Git porcelain inside Emacs."
'((emacs "25.1")
(async "1.9.3")
(dash "2.14.1")
(ghub "3.0.0")
(git-commit "2.13.0")
(git-commit "2.90.0")
(magit-popup "2.12.4")
(with-editor "2.8.0")))
......@@ -179,13 +179,16 @@ Usually this is just its basename."
(defun magit-repolist-column-version (_id)
"Insert a description of the repository's `HEAD' revision."
(let ((v (or (magit-git-string "describe" "--tags")
(let ((v (or (magit-git-string "describe" "--tags" "--dirty")
;; If there are no tags, use the date in MELPA format.
(magit-git-string "show" "--no-patch" "--format=%cd-g%h"
"--date=format:%Y%m%d.%H%M"))))
(if (and v (string-match-p "\\`[0-9]" v))
(concat " " v)
v)))
(save-match-data
(when (string-match "-dirty\\'" v)
(put-text-property (1+ (match-beginning 0)) (length v) 'face 'error v))
(if (and v (string-match "\\`[0-9]" v))
(concat " " v)
v))))
(defun magit-repolist-column-branch (_id)
"Insert the current branch."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment