Codebase list magit / d13ae06
New upstream version 2.90.1 Rémi Vanicat 5 years ago
14 changed file(s) with 118 addition(s) and 18 deletion(s). Raw diff Collapse all Expand all
+3
-0
Documentation/AUTHORS.md less more
4949 - Alban Gruin <alban@pa1ch.fr>
5050 - Aleksey Uimanov <s9gf4ult@gmail.com>
5151 - Alexander Gramiak <fice-t@protonmail.com>
52 - Alex Branham <alex.branham@gmail.com>
5253 - Alex Dunn <adunn@ucsb.edu>
5354 - Alexey Voinov <alexey.v.voinov@gmail.com>
5455 - Alex Kost <alezost@gmail.com>
153154 - Joakim Jalap <JOJA@stoneridge.com>
154155 - Johann Klähn <kljohann@gmail.com>
155156 - John Mastro <john.b.mastro@gmail.com>
157 - John Morris <john@zultron.com>
156158 - John Wiegley <johnw@newartisans.com>
157159 - Jonas Bernoulli <jonas@bernoul.li>
158160 - Jonathan Leech-Pepin <jonathan.leechpepin@gmail.com>
169171 - Kan-Ru Chen <kanru@kanru.info>
170172 - Kenny Ballou <kballou@devnulllabs.io>
171173 - Keshav Kini <keshav.kini@gmail.com>
174 - Kevin Brubeck Unhammer <unhammer@fsfe.org>
172175 - Kévin Le Gouguec <kevin.legouguec@gmail.com>
173176 - Kimberly Wolk <kimwolk@hotmail.com>
174177 - Kyle Meyer <kyle@kyleam.com>
+39
-0
Documentation/RelNotes/2.90.1.org less more
0 * Magit v2.90.1 Release Notes
1 ** Changes since v2.90.0
2
3 - Added ~bug-reference-mode~ to ~git-commit-setup-hook~. e19e8fb1e
4
5 - The "Version" column in ~magit-submodule-list-mode~ and
6 ~magit-repolist-mode~ buffers now shows when a repository is dirty.
7 0b86dbfd6
8
9 - Added new command ~magit-log-merged~. This command requires
10 ~git-when-merged~ (https://github.com/mhagger/git-when-merged). It
11 isn't bound in ~magit-log-popup~ by default. To add it, you can use
12 something like
13
14 #+BEGIN_SRC emacs-lisp
15 (magit-define-popup-action 'magit-log-popup
16 ?m "Log commit's merge" 'magit-log-merged)
17 #+END_SRC
18
19 #3657
20
21 ** Fixes since v2.90.0
22
23 - Bumped the minimal required version of ~git-commit~ to the correct
24 version. e9bd33758
25
26 - Dropped the new "v" prefix that we started to add to release tags
27 starting with the previous release in places where that prefix is
28 undesirable. f441cf6d7
29
30 - Staging and unstaging submodules while ~diff.submodule~'s value is ~log~
31 broke shortly before the v2.90.0 release. #3654
32
33 * Authors
34
35 10 Jonas Bernoulli
36 1 Allen Li
37 1 Kevin Brubeck Unhammer
38 1 Kyle Meyer
+33
-0
Documentation/RelNotes/2.91.0.org less more
0 * Magit v2.91.0 Release Notes (unreleased)
1 ** Breaking changes
2 ** Changes since v2.90.0
3
4 - Added ~bug-reference-mode~ to ~git-commit-setup-hook~. e19e8fb1e
5
6 - The "Version" column in ~magit-submodule-list-mode~ and
7 ~magit-repolist-mode~ buffers now shows when a repository is dirty.
8 0b86dbfd6
9
10 - Added new command ~magit-log-merged~. This command requires
11 ~git-when-merged~ (https://github.com/mhagger/git-when-merged). It
12 isn't bound in ~magit-log-popup~ by default. To add it, you can use
13 something like
14
15 #+BEGIN_SRC emacs-lisp
16 (magit-define-popup-action 'magit-log-popup
17 ?m "Log commit's merge" 'magit-log-merged)
18 #+END_SRC
19
20 #3657
21
22 ** Fixes since v2.90.0
23
24 - Bumped the minimal required version of ~git-commit~ to the correct
25 version. e9bd33758
26
27 - Dropped the new "v" prefix that we started to add to release tags
28 starting with the previous release in places where that prefix is
29 undesirable. f441cf6d7
30
31 - Staging and unstaging submodules while ~diff.submodule~'s value is ~log~
32 broke shortly before the v2.90.0 release. #3654
+3
-3
Documentation/magit.org less more
77 #+TEXINFO_DIR_CATEGORY: Emacs
88 #+TEXINFO_DIR_TITLE: Magit: (magit).
99 #+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
10 #+SUBTITLE: for version 2.90.0
10 #+SUBTITLE: for version 2.90.1
1111 #+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings
1212
1313 #+TEXINFO_DEFFN: t
2222 Magit and Git itself deserve to be called porcelains.
2323
2424 #+TEXINFO: @noindent
25 This manual is for Magit version 2.90.0.
25 This manual is for Magit version 2.90.1.
2626
2727 #+BEGIN_QUOTE
2828 Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
29982998 - ~all~ Show related local and remote branches.
29992999 - ~mixed~ Show all containing branches and local merged branches.
30003000
3001 - User Option: magit-revision-show-gravatar
3001 - User Option: magit-revision-show-gravatars
30023002
30033003 Whether to show gravatar images in revision buffers.
30043004
+3
-3
Documentation/magit.texi less more
3030 @finalout
3131 @titlepage
3232 @title Magit User Manual
33 @subtitle for version 2.90.0
33 @subtitle for version 2.90.1
3434 @author Jonas Bernoulli
3535 @page
3636 @vskip 0pt plus 1filll
5252 Magit and Git itself deserve to be called porcelains.
5353
5454 @noindent
55 This manual is for Magit version 2.90.0.
55 This manual is for Magit version 2.90.1.
5656
5757 @quotation
5858 Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
40844084 @end itemize
40854085 @end defopt
40864086
4087 @defopt magit-revision-show-gravatar
4087 @defopt magit-revision-show-gravatars
40884088
40894089 Whether to show gravatar images in revision buffers.
40904090
+0
-1
RelNotes less more
0 Documentation/RelNotes/2.90.0.org⏎
+1
-0
RelNotes.org less more
0 Documentation/RelNotes/2.90.1.org⏎
+2
-2
default.mk less more
9595
9696 ## Versions ##########################################################
9797
98 VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0)
98 VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0 | cut -c2-)
9999
100100 ASYNC_VERSION = 1.9.3
101101 DASH_VERSION = 2.14.1
102102 GHUB_VERSION = 3.0.0
103 GIT_COMMIT_VERSION = 2.13.0
103 GIT_COMMIT_VERSION = 2.90.0
104104 MAGIT_POPUP_VERSION = 2.12.4
105105 WITH_EDITOR_VERSION = 2.8.0
106106
+1
-0
lisp/git-commit.el less more
174174 git-commit-setup-changelog-support
175175 git-commit-turn-on-auto-fill
176176 git-commit-propertize-diff
177 bug-reference-mode
177178 with-editor-usage-message)
178179 "Hook run at the end of `git-commit-setup'."
179180 :group 'git-commit
+2
-2
lisp/magit-apply.el less more
207207 (magit-refresh))))
208208
209209 (defun magit-apply--get-selection ()
210 (or (magit-region-sections '(hunk file) t)
210 (or (magit-region-sections '(hunk file module) t)
211211 (let ((section (magit-current-section)))
212212 (pcase (oref section type)
213 ((or `hunk `file) section)
213 ((or `hunk `file `module) section)
214214 ((or `staged `unstaged `untracked
215215 `stashed-index `stashed-worktree `stashed-untracked)
216216 (oref section children))
+21
-0
lisp/magit-log.el less more
751751 (with-current-buffer buf
752752 (goto-char pos)
753753 (call-interactively #'magit-log-trace-definition)))))
754
755 ;;;###autoload
756 (defun magit-log-merged (commit branch &optional args files)
757 "Show log for the merge of COMMIT into BRANCH.
758 More precisely, find merge commit M that brought COMMIT into
759 BRANCH, and show the log of the range \"M^..M\". This command
760 requires git-when-merged, which is available from
761 https://github.com/mhagger/git-when-merged."
762 (interactive
763 (append (let ((commit (magit-read-branch-or-commit "Commit")))
764 (list commit
765 (magit-read-other-branch "Merged into" commit)))
766 (magit-log-arguments)))
767 (unless (executable-find "git-when-merged")
768 (user-error "This command requires git-when-merged (%s)"
769 "https://github.com/mhagger/git-when-merged"))
770 (magit-git-log
771 (list (or (magit-git-string "when-merged" "--show-branch" commit branch)
772 (user-error "Could not find when %s was merged into %s"
773 commit branch)))
774 args files))
754775
755776 (defun magit-git-reflog (ref args)
756777 (require 'magit)
+1
-1
lisp/magit-merge.el less more
136136 (defun magit--merge-absort (branch args)
137137 (when (equal branch "master")
138138 (unless (yes-or-no-p
139 "Do you really want to to merge `master' into another branch? ")
139 "Do you really want to merge `master' into another branch? ")
140140 (user-error "Abort")))
141141 (if-let ((target (magit-get-push-branch branch t)))
142142 (progn
+2
-2
lisp/magit-pkg.el less more
0 (define-package "magit" "2.90.0"
0 (define-package "magit" "2.90.1"
11 "A Git porcelain inside Emacs."
22 '((emacs "25.1")
33 (async "1.9.3")
44 (dash "2.14.1")
55 (ghub "3.0.0")
6 (git-commit "2.13.0")
6 (git-commit "2.90.0")
77 (magit-popup "2.12.4")
88 (with-editor "2.8.0")))
+7
-4
lisp/magit-repos.el less more
178178
179179 (defun magit-repolist-column-version (_id)
180180 "Insert a description of the repository's `HEAD' revision."
181 (let ((v (or (magit-git-string "describe" "--tags")
181 (let ((v (or (magit-git-string "describe" "--tags" "--dirty")
182182 ;; If there are no tags, use the date in MELPA format.
183183 (magit-git-string "show" "--no-patch" "--format=%cd-g%h"
184184 "--date=format:%Y%m%d.%H%M"))))
185 (if (and v (string-match-p "\\`[0-9]" v))
186 (concat " " v)
187 v)))
185 (save-match-data
186 (when (string-match "-dirty\\'" v)
187 (put-text-property (1+ (match-beginning 0)) (length v) 'face 'error v))
188 (if (and v (string-match "\\`[0-9]" v))
189 (concat " " v)
190 v))))
188191
189192 (defun magit-repolist-column-branch (_id)
190193 "Insert the current branch."