Git log: commit 8454677269b59378b5946d17c93bb8a8f3d95f02
Author: Rémi Vanicat <vanicat@debian.org>
Date: Tue May 25 13:04:11 2021 +0200
Add an elpa-magit-section package
It has been separated upstream.
commit 4558f8edc5ee4135deb1d46f1150af58763738d4
Author: Rémi Vanicat <vanicat@debian.org>
Date: Tue May 25 12:53:22 2021 +0200
Adapt patches.
commit 36241db472c2965f8af4047767797af87c39a0f2
Author: Rémi Vanicat <vanicat@debian.org>
Date: Tue May 25 12:24:04 2021 +0200
Changelog for new upstream
commit dcb22a12c3a555d61c5d1db4dfe3acb074a20ca4
Merge: de47aa13 4a5b95d3
Author: Rémi Vanicat <vanicat@debian.org>
Date: Tue May 25 12:22:56 2021 +0200
Update upstream source from tag 'upstream/3.0.0'
Update to upstream version '3.0.0'
with Debian dir 64c87ca3c2feb87f720a3dcbba85205952d98ed0
commit 4a5b95d305939272402c76bc08f538009dfcacfd
Merge: 3282222d c3bbc9b9
Author: Rémi Vanicat <vanicat@debian.org>
Date: Tue May 25 12:22:56 2021 +0200
New upstream version 3.0.0
commit de47aa13a08fc5a5c2a37c625faaafd78005eb69
Author: Rémi Vanicat <vanicat@debian.org>
Date: Tue May 25 12:22:00 2021 +0200
Update watch file
commit c3bbc9b9425f3370690cabb11bd35b9040773fdc
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Tue May 25 10:14:56 2021 +0200
Release version 3.0.0
commit 2923b81bede47f42797ed3d8f714c75416807138
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Tue May 25 10:11:00 2021 +0200
Update release notes
commit ff5e0feff926996cb9261e21daf1148219d816fe
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Tue May 25 10:10:00 2021 +0200
magit.el: Update library commentary
Use the same description as used in announcements.
commit 44d43b17148412658eb75b75413b05b71d15300b
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Tue May 25 10:09:00 2021 +0200
make: Fix updating magit-pkg.el
commit b78676d072c9915730662b1666dd3d879f171faa
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Tue May 25 10:08:00 2021 +0200
Add SPDX-License-Identifier library header
commit afc27619c59ee2c7aa473d326d02322c6e9951f4
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Tue May 25 10:07:00 2021 +0200
git-commit.el: Fix "Author" library header
The header is named "Author" and my attempt to teach `lm-authors'
to also support "Authors" was met with resistance.
While at also stop aligning email addresses.
commit 063e6a153de8d8c78bbb9729b57e6e1b9e51b07d
Author: Kyle Meyer <kyle@kyleam.com>
Date: Tue May 25 01:12:55 2021 -0400
magit--maybe-update-revision-buffer: Honor log's file filter
magit--maybe-update-revision-buffer sets up an idle timer function
that captures the result of calling magit-show-commit--arguments.
Before the call, the revision buffer is set as the current buffer.
Changing to the revision buffer interferes with toggling the file
restriction from the log buffer via magit-diff-toggle-file-filter.
The filter can be turned off, but, if the caller moves to another
line, the filter can't be turned back on again because, in order to
find the file arguments, magit-show-commit--arguments needs to be
called from the log buffer.
Call magit-show-commit--arguments without changing the buffer so that
the file arguments can still be grabbed from the magit-log-mode
buffer. This shouldn't change the behavior in any other way because
underneath magit-diff-arguments handles finding the revision buffer
(and magit-direct-use-buffer-arguments is let-bound to `selected').
Re: #4382
commit c93d98c59d1c286545c2542fa3eba3a884f8b601
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Mon May 24 18:34:16 2021 +0200
make: Update path to ox-extra
commit b90a9d2a5196ae05dae4a95bbc9fb6ff9fdb8c18
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Mon May 24 17:13:16 2021 +0200
AUTHORS.md: Update list of contributors
commit d07ce4f71d6f2bf34e99e6b325d1871ec4e2a15d
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Mon May 24 15:26:27 2021 +0200
magit.el: Add myself as the second author beside Marius
I would change "Author:" to "Authors:", but the official function
for extracting this information (lm-authors) does not support this
and my attempt to fix this was just rejected (in an effort "To keep
Emacs smaller and less complex").
commit 32857a2711209d9527b03abe6bfee4d51742a2dd
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Mon May 24 15:10:40 2021 +0200
magit.el: No longer align email addresses in library header
Also untabify the affected lines.
commit e37882710bd91d95bac967d342e5aea846cce783
Author: Ashlynn Anderson <pea@pea.sh>
Date: Fri May 21 05:13:19 2021 -0400
Consolidate git/libgit CI steps
Seems unnecessary to have two separate steps here.
commit 9d76233597aaad1c9ab188bde83c3b66d9bd3d0a
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed May 19 22:11:51 2021 +0200
magit-refresh-buffer: Improve order in which windows are handled
If it qualifies, then the selected window comes first, but we want
to handle it last so that its `magit-section-movement-hook' run can
override the effects of other runs.
commit 2cc60362efc0ef6717bbf0d01e48ef6e0c087d56
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed May 19 22:03:26 2021 +0200
magit-refresh-buffer: Cosmetics
commit 482c25a3204468a4f6c2fe12ff061666b61f5f4d
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed May 19 21:00:12 2021 +0200
magit-refresh-buffer: Fix window handling
Previously we assumed that the `window-start' is associated with a
window AND a buffer, but this is wrong. Each window only has one
`window-start'.
When the buffer was not displayed in any window, then we made the
buffer current in the selected window (using `with-current-buffer')
and then called `magit-section-goto-successor', which is fine except
that that may end up running `magit-section-movement-hook' and one of
the functions on that hook (`magit-hunk-set-window-start') may call
`set-window-start'.
(This only happened if current section was a hunk and the user edited
the respective file in a way that caused that hunk to disappear, which
turned into a long-lived heisenbug.)
The `window-start' is not actually adjusted until Emacs redisplays at
which point the `with-current-buffer' is no longer in effect, so the
window start adjustment affects whatever buffer is actually current in
the selected window, essentially causing point to jump to some random
location.
To avoid this, we suppress `magit-section-goto-successor-hook' when
the buffer is not current in any window. We do not try to only
suppress `magit-hunk-set-window-start', but suppress all hook
functions because the other functions are also undesirable when the
buffer is not current, just not as fatally.
Closes #4196.
commit fcd50dd8ae7cb33332eb7c6d90932be41b869cae
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed May 12 21:49:03 2021 +0200
Use with-eval-after-load
It is available since Emacs 24.4.
commit d8a06bb2e27f4970140b1e5cd6965a52d0bb1e1c
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Tue May 11 08:53:19 2021 +0200
magit-insert-revision-tag: Use magit-process-file
commit 471c63d92ce22b8ea653f821bc1893ecea324d4d
Author: Kyle Meyer <kyle@kyleam.com>
Date: Fri Apr 30 00:04:44 2021 -0400
magit-primary-remote: Fix a doc-string typo
commit 3fdf7e0da717d71e2ad0d71781bb2da090f51a5e
Author: Sam Cedarbaum <scedarbaum@gmail.com>
Date: Thu Apr 15 01:13:46 2021 -0400
Run tests using both Git and libgit functions in CI
- Add new make targets `test-git' and `test-libgit', which ensure
that tests are run using the Git CLI and libgit, respectively.
- Add `git_impl' dimension to GitHub Actions build matrix, which
controls which Git implementation that tests use.
commit 1f3995ec81cb110eeef885c9921ecfefac07bdf3
Author: Sam Cedarbaum <scedarbaum@gmail.com>
Date: Thu Apr 15 00:38:23 2021 -0400
Install Emacs with libegit in CI
Replace the `setup-emacs' GitHub action with a custom Nix install
(defined in t/default.nix) that bundles Emacsen with libegit and
its other dependencies.
commit 3098bf68f258e088ac0d3307398d99d8c2edba41
Author: Sam Cedarbaum <scedarbaum@gmail.com>
Date: Thu Apr 15 00:20:52 2021 -0400
Add tests for `magit-bare-repo-p'
Add simple tests for `magit-bare-repo-p', which is implemented with
both Git and libgit.
commit f883b62fedd42eaabace946336d61457211cc5ff
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed Apr 21 19:15:25 2021 +0200
Support naming the upstream remote something other than "origin"
Avoid using the term "upstream" though because, like "origin", it
unfortunately is ambiguous. Instead call it the "primary" remote.
commit 8d00b6dfe5f9df2bdd0088ef39414df7b509bb02
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed Apr 21 19:02:08 2021 +0200
magit-clone-internal: Respect --origin and clone.defaultRemote
commit 67f0e0740e5ef20a2418cebc79b0e0ec27b791a0
Author: Kyle Meyer <kyle@kyleam.com>
Date: Tue Apr 20 21:51:27 2021 -0400
magit--assert-usable-git: Avoid git-config's --default
99291801a (Propagate git failures that are due to corrupt
configuration, 2021-04-04) used git-config's --default option to
construct an invocation that should always pass unless the
configuration is corrupt or otherwise unusable. --default, however,
wasn't introduced until Git 2.18.0.
Instead construct the command with --get-color. It looks weirder but
has been available since v1.5.4. (I've tested with the oldest Git I
can build, 2.9.0.)
Closes #4365.
commit 590034dc8833fc2723c16ecaa7f6a99949aea90e
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Tue Apr 20 21:42:19 2021 +0200
magit-main-branch: Improve doc-string
commit c7364e169648f454dc73fe50596d827fbf1f0fb7
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed Apr 14 15:03:45 2021 +0200
magit--make-bookmark: Correct form of return value
Do so early on so that any function we call internally
can also benefit from use doing things correctly.
commit b92a490444d6a726a77e2251d7a9c9bd3231b539
Author: Daniel Fleischer <danflscr@gmail.com>
Date: Sat Apr 3 16:19:16 2021 +0300
magit--handle-bookmark: Mend incompatibility with bookmark+ package
Do so by calling bookmark+ jumping function if the package is
loaded. In bookmark+, custom handlers are expected to handle
jumping if necessary.
commit 5882df245d3388cd6f443bc11df219a838104df2
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Sun Apr 11 22:36:01 2021 +0200
magit-bind-magit-project-status: New variable
See #4349 and #4357.
commit 0edb4e156f182a478d816e068c2b7641a202ea44
Author: Sam Cedarbaum <scedarbaum@gmail.com>
Date: Thu Mar 11 01:42:11 2021 -0600
test: magit-with-test-directory: expand symlinks
Expand symlinks in the test directory created by the
`magit-with-test-directory' macro. This ensures that path comparisons
with results from `magit-toplevel', which itself expands symlinks,
work as expected.
commit 4f41ba4945f4688579fa22394f04bf0baebe9484
Author: Kyle Meyer <kyle@kyleam.com>
Date: Sun Apr 4 17:19:19 2021 -0400
manual: Point auto-fetchers to push.useForceIfIncludes
Re: https://github.com/magit/magit/discussions/4355
commit 99291801afa25ef015dbc8635594ff58b30b246b
Author: Kyle Meyer <kyle@kyleam.com>
Date: Sun Apr 4 17:50:54 2021 -0400
Propagate git failures that are due to corrupt configuration
magit-toplevel uses a failing `git rev-parse --show-toplevel' to
decide that it's not in a working tree. In case of corrupt Git
configuration, it will incorrectly conclude that it's not in a
repository and won't propagate the error to the user. These two
failures can't be distinguished by exit code. We can check for a
corrupt configuration with a follow-up git-config call, but it's
probably not worth doing that within the heavily used magit-toplevel.
Instead do it as part of the existing
magit--not-inside-repository-error handling as well as when an
interactive call to magit-status doesn't find a repository. This
covers magit-status, magit-status-setup-buffer, and
magit-get-mode-buffer, so it should ensure that the error is relayed
to the caller.
Closes #4337.
commit 1cc2275e91c2c0f009ff25a643129f72d54f8b85
Author: Kyle Meyer <kyle@kyleam.com>
Date: Sun Apr 4 20:40:36 2021 -0400
magit-notes:--ref: Fix description
Restore description lost in ad55ecb8 (magit-notes:--ref: Define option
explicitly, 2019-02-04).
commit abb61935c65bc02815a6397c0e5d867aebcf5e54
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Sun Mar 28 19:29:02 2021 +0200
git-commit-setup-font-lock: Avoid needless work
Closes #4353.
commit 1fa921182070086192ab55bf2c611f330eac99de
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Sun Mar 28 19:28:25 2021 +0200
git-commit-font-lock-keywords-3: Update a regexp
commit 1dec6cb658f8a88ab6b1140c25b0585189d57336
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Sun Mar 28 19:28:07 2021 +0200
Default to using git-commit-font-lock-keywords-3
commit 577f16da3072a0ae85fba6b25a36a971a61ec6c2
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Sat Mar 27 17:17:43 2021 +0100
AUTHORS.md: Update list of contributors
commit a0446f8ee32ffe2b34782afb06e90d869bf1ba13
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Sat Mar 27 17:13:28 2021 +0100
magit-diff-wash-diff: Silence 28 byte-compiler
commit 527842a3b0fd868bd0c193c430a6ad290dd62053
Author: Kyle Meyer <kyle@kyleam.com>
Date: Thu Mar 25 23:29:22 2021 -0400
magit-extras: Avoid recently added custom--standard-value
custom--standard-value is currently only available in the Emacs master
branch (added in 04ab3904ed, 2021-02-02). Inline its short
definition.
commit c6bfe83f803691bf8bf58aba8fd548c17e53cd43
Author: Martin Polden <mpolden@yahoo-inc.com>
Date: Thu Mar 25 14:40:00 2021 +0100
Add to end of project-switch-commands, instead of beginning
commit 5f558702c1d3bebe1807dc5bfbd854ab01b4e5c4
Author: Martin Polden <mpolden@yahoo-inc.com>
Date: Thu Mar 25 14:33:09 2021 +0100
Only modify project-switch-commands if not already modified
Co-authored-by: Jonas Bernoulli <jonas@bernoul.li>
commit cb9bb20cfe8e3a50df8669a43611ebc9a516358a
Author: pancho horrillo <pancho@pancho.name>
Date: Fri Mar 12 10:29:04 2021 +0100
manual: Fix typo
commit fb25d4e9c68b566b330704aaeec11aa8d8053b19
Author: Basil L. Contovounesios <contovob@tcd.ie>
Date: Wed Mar 10 15:54:05 2021 +0000
magit-extras: Update project.el integration
The format of project-switch-commands changed. The car is now the
command, and its key binding is looked up in project-prefix-map:
Remove the duplication from project-switch-commands's config
51698f77dd 2020-12-13 22:50:55 +0200
https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=51698f77dd6356049fcacdb01ebe80cfe4c67272
This change is included in project.el version 0.5.4 of 2021-03-09,
which also lowers the minimum required Emacs version from 26.3 to
26.1.
Consistently calling magit-project-status instead of magit-status
has the benefit of going through project-remember-project, which
marks the selected project as the most recently used, for the
benefit of completion.
commit 15912b65d17c3da6fb7e9817a148904485983408
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Thu Mar 11 19:52:15 2021 +0100
magit-revision-refresh-buffer: Accept very short hashes
For very short hashes `magit-object-type' returns nil,
so use the full hash where nil would lead to an error.
commit f4b6cf22198a9cbd543724f8423f14273f3a0e0f
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Thu Mar 11 19:51:53 2021 +0100
magit-thingatpt--git-revision: Return fewer false-positives
commit 3bf55ce9c9ba2ab39e5baca892053b830dcb1fa2
Author: danielfleischer <daniel.fleischer@amobee.com>
Date: Wed Mar 10 17:17:33 2021 +0200
magit-log{,-refresh}: Add --regexp-ignore-case
commit 4735b9254105eb7dd538f979d8b4c6ab96b827b9
Author: Vladimir Panteleev <git@thecybershadow.net>
Date: Mon Mar 8 08:09:15 2021 +0000
magit-file-dispatch: Fix for dired buffers
As of 5a38e1bb0fffa0326a1b5073c0ce9b05386e5109, `magit-file-dispatch'
forwards to `magit-dispatch' for dired buffers, which prevents using
it to e.g. request a git log only for the currently visited directory.
commit 2277752a176f0b649fd72424d3427bf28184802e
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Tue Mar 9 12:06:43 2021 +0100
git-commit-major-mode: Support fundamental-mode
commit e13167dd80fde2d9ee1f3fcded23a6eb9399be6b
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Tue Mar 9 11:48:21 2021 +0100
git-commit-major-mode: Declare safe local-variable values
Closes #4340.
commit dafd5b69dbc4744643d2210ea2818951e1ade08f
Author: Jonas Bernoulli <jonas@bernoul.li>
Date: Tue Mar 9 11:47:55 2021 +0100
git-commit-major-mode: Suggest git-commit-elisp-text-mode
