| Age | Commit message (Collapse) | Author |
|---|
|
|
|
magit-current-blame-chunk passes the result of
magit-file-relative-name to git-blame. For a Dired buffer, this value
is default-directory, and passing a directory to git-blame will lead
to an error. This error can show up when various commands unrelated
to magit-blame are called from a Dired buffer because
magit-current-blame-chunk is called by magit-commit-at-point and
magit-branch-or-commit-at-point.
Don't try to blame the return value of magit-file-relative-name when
in a Dired buffer, letting the "no file" case be handled according
NOERROR.
Fixes #4560.
|
|
These sections existed because I am not fully happy with how
`org-cycle' works, which I should deal with by patching that
function or writing a substitute.
|
|
|
|
Closes #4534.
|
|
|
|
|
|
|
|
|
|
The idea is to make it easier to see in which repositories
a feature branch is checked out.
|
|
Go back to include the height of the decent part in the calculation.
The actual problem was that on hidef monitors the `:scale' is set to
a number greater than 1 (rendering our careful calculation moot) and
our attempt to override that failed.
|
|
Fixes a regression introduced in [1: bac25e73c].
1: 2021-08-29 bac25e73c50fda8ed319cebb69f20e56f8bc7376
Avoid needless selection re-highlighting
|
|
If the git directory is separate from the main worktree,
then "git worktree" returns the git directory instead of
the worktree, which isn't what it is supposed to do and
now what we want.
|
|
- Actually compare the remote parts as intended.
- Remove a redundant condition.
Closes #4292.
|
|
|
|
|
|
|
|
|
|
Instead of ox-extra's "ignored sections" use
ox-texinfo+'s new "dissolvable headlines".
|
|
Closes #4458.
|
|
|
|
Different users need mutually exclusive kludges,
therefore we need an option. See #4132 for details.
|
|
|
|
|
|
The modified readers prefer the branch at point (if any) over the
commit at point. In some cases the user might prefer the commit in
some cases so we now offer that as the first "next history element".
Closes #4291.
|
|
The old attempt in [1: 1301db2c2] did not work because region
highlighting is updated more often than section highlighting
(on redisplay, not just on post-command-hook) and the former
always reset the state that could allow for the latter to be
avoided.
Closes #3976.
1: 2015-04-29 1301db2c2e6e21beac50fa215d543c09bb8516c5
avoid re-highlighting when moving within the same section
|
|
magit-wip-update-wipref switched the reflog message from "restart
autosaving ..." to "start autosaving ..." in 40c06c51 (wipref: Support
automatic merging of real branch into wip ref, 2018-08-02).
magit-wip-log-get-tips searches for this message in order to find
previous tips of the wip refs, but its regular expression wasn't
updated with that commit.
Teach magit-wip-log-get-tips to look for the new reflog message in
addition to the old one. With Git's default gc settings, it's pretty
unlikely to encounter the old message at this point, but a user may
have set gc.reflogExpire to "never".
|
|
Closes #4392.
|
|
|
|
|
|
|
|
Closes #4094.
|
|
This function does not reliably return the number of lines between
two positions. It returns either that, or that plus one; which is
of course completely bonkers.
Closes #4148.
|
|
|
|
Closes #4259.
|
|
|
|
Closes #4387.
|
|
Closes #4379.
|
|
Like some "git stash save" variants, `magit-stash-both' calls "git
reset --hard", which among other things discards merge state. This
is intentional but likely surprising so ask users if they really
want that.
Closes #4345.
|
|
Closes #4206.
|
|
No longer automatically add `--full-history' when showing log for a
single file that isn't being tracked anymore.
- In many cases this argument isn't needed to ensure that there aren't
zero commits shown for a removed file.
- This argument can be relatively expensive.
This reverts [1: 1cda70250], closes #4381.
1: 2017-10-26 1cda7025014c6e2efc859379b3d7ac8bd9a4109a
magit-log-refresh-buffer: add --full-history for single removed file
|
|
|
|
|
|
|
|
|
|
|
|
Closes #4446.
|
|
|
|
|
|
|
