<feed xmlns='http://www.w3.org/2005/Atom'>
<title>magit.git, branch v4.3.4</title>
<subtitle>Unnamed repository; edit this file 'description' to name the repository.
</subtitle>
<link rel='alternate' type='text/html' href='http://git.tews.dev/cgit/magit.git/'/>
<entry>
<title>Release version 4.3.4</title>
<updated>2025-05-13T14:44:03+00:00</updated>
<author>
<name>Jonas Bernoulli</name>
<email>jonas@bernoul.li</email>
</author>
<published>2025-05-13T14:44:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.tews.dev/cgit/magit.git/commit/?id=f88225f6a8731a5f950e7c6e4c955eddbf820c87'/>
<id>f88225f6a8731a5f950e7c6e4c955eddbf820c87</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>AUTHORS.md: Update list of contributors</title>
<updated>2025-05-13T14:36:04+00:00</updated>
<author>
<name>Jonas Bernoulli</name>
<email>jonas@bernoul.li</email>
</author>
<published>2025-05-13T14:36:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.tews.dev/cgit/magit.git/commit/?id=8266e331fc469aa2d4804beb1b61006dad58ea83'/>
<id>8266e331fc469aa2d4804beb1b61006dad58ea83</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Update changelog</title>
<updated>2025-05-13T14:35:35+00:00</updated>
<author>
<name>Jonas Bernoulli</name>
<email>jonas@bernoul.li</email>
</author>
<published>2025-05-13T14:35:35+00:00</published>
<link rel='alternate' type='text/html' href='http://git.tews.dev/cgit/magit.git/commit/?id=b382fd68722d0a5069b1367c1a807fcc05da62d4'/>
<id>b382fd68722d0a5069b1367c1a807fcc05da62d4</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>magit-apply--get-selection: Return t for untracked type</title>
<updated>2025-05-12T17:00:19+00:00</updated>
<author>
<name>Jonas Bernoulli</name>
<email>jonas@bernoul.li</email>
</author>
<published>2025-05-12T17:00:19+00:00</published>
<link rel='alternate' type='text/html' href='http://git.tews.dev/cgit/magit.git/commit/?id=084f749a7e090d2cdb67d68bc6f3d4be7a7f1587'/>
<id>084f749a7e090d2cdb67d68bc6f3d4be7a7f1587</id>
<content type='text'>
When "Untracked files" has not been expanded yet, then its children
slot is nil, for performance reasons.  For this section most callers
treat the returned value as a boolean, so just return t instead.

One caller, which did not treat the value as a boolean, has to be
adjusted.

Closes #5366.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When "Untracked files" has not been expanded yet, then its children
slot is nil, for performance reasons.  For this section most callers
treat the returned value as a boolean, so just return t instead.

One caller, which did not treat the value as a boolean, has to be
adjusted.

Closes #5366.
</pre>
</div>
</content>
</entry>
<entry>
<title>magit-rebase--todo: Fix handling of merge actions</title>
<updated>2025-05-12T16:32:00+00:00</updated>
<author>
<name>Kyle Meyer</name>
<email>kyle@kyleam.com</email>
</author>
<published>2025-05-12T16:23:42+00:00</published>
<link rel='alternate' type='text/html' href='http://git.tews.dev/cgit/magit.git/commit/?id=04863968467597cf4e2e9ba6c0cd429fb3e86636'/>
<id>04863968467597cf4e2e9ba6c0cd429fb3e86636</id>
<content type='text'>
Inserting rebase actions into the status buffer when --rebase-merges
is specified triggers two errors with the v4.3.3 release:

 1) a type error due to empty lines in the todo list

 2) an unbound slot error due to misalignment between the abbrevs list
    returned by 'git log --no-walk --format=%h &lt;commit&gt;...' and the
    input commits

The first was resolved a few commits back with 621e69eb
(magit-rebase-insert-merge-sequence: Skip over empty lines).

The second error is avoided by 4fc60fdb (magit-rebase--todo: Deal with
duplicated commits).  The new logic requests that the git-log call
also output the full hash so that abbrevs can be used as an alist
mapping a long hash to an abbreviated one.  But the output lines are
not actually split from the '%H %h' strings into alist entries, so the
magit-rev-abbrev fallback always fires, eliminating the v4.3.3 speedup
that came from the one-shot git-log call.

The known reason for having duplicate commits across rebase todo lines
is that, when constructing commits to pass to git-log, a faulty
always-nil condition prevents the commit from being extracted from the
-C/-c options of merge lines.  Once that condition is fixed, I haven't
found a case where two todo lines point to the same commit.

Revert the changes from 4fc60fdb and instead fix the merge condition,
adding an assertion on top so that someone will let us know if they
hit into a case where the resolved number of commits is fewer.

(Also, specify --no-walk=unsorted to ensure commits come back in the
order in which they were passed to git-log.)

Re: #5365
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Inserting rebase actions into the status buffer when --rebase-merges
is specified triggers two errors with the v4.3.3 release:

 1) a type error due to empty lines in the todo list

 2) an unbound slot error due to misalignment between the abbrevs list
    returned by 'git log --no-walk --format=%h &lt;commit&gt;...' and the
    input commits

The first was resolved a few commits back with 621e69eb
(magit-rebase-insert-merge-sequence: Skip over empty lines).

The second error is avoided by 4fc60fdb (magit-rebase--todo: Deal with
duplicated commits).  The new logic requests that the git-log call
also output the full hash so that abbrevs can be used as an alist
mapping a long hash to an abbreviated one.  But the output lines are
not actually split from the '%H %h' strings into alist entries, so the
magit-rev-abbrev fallback always fires, eliminating the v4.3.3 speedup
that came from the one-shot git-log call.

The known reason for having duplicate commits across rebase todo lines
is that, when constructing commits to pass to git-log, a faulty
always-nil condition prevents the commit from being extracted from the
-C/-c options of merge lines.  Once that condition is fixed, I haven't
found a case where two todo lines point to the same commit.

Revert the changes from 4fc60fdb and instead fix the merge condition,
adding an assertion on top so that someone will let us know if they
hit into a case where the resolved number of commits is fewer.

(Also, specify --no-walk=unsorted to ensure commits come back in the
order in which they were passed to git-log.)

Re: #5365
</pre>
</div>
</content>
</entry>
<entry>
<title>magit-sequence-insert-step: Use more appropriate face</title>
<updated>2025-05-11T20:58:11+00:00</updated>
<author>
<name>Jonas Bernoulli</name>
<email>jonas@bernoul.li</email>
</author>
<published>2025-05-11T20:58:11+00:00</published>
<link rel='alternate' type='text/html' href='http://git.tews.dev/cgit/magit.git/commit/?id=3a8d12b7b823d0a4bb0eeabd0a82a3b05c911343'/>
<id>3a8d12b7b823d0a4bb0eeabd0a82a3b05c911343</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>magit-rebase--todo: Deal with duplicated commits</title>
<updated>2025-05-11T20:55:09+00:00</updated>
<author>
<name>Jonas Bernoulli</name>
<email>jonas@bernoul.li</email>
</author>
<published>2025-05-11T20:55:09+00:00</published>
<link rel='alternate' type='text/html' href='http://git.tews.dev/cgit/magit.git/commit/?id=4fc60fdb36b74baca7421719f3a2e203ed16e6ed'/>
<id>4fc60fdb36b74baca7421719f3a2e203ed16e6ed</id>
<content type='text'>
Closes #5365.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Closes #5365.
</pre>
</div>
</content>
</entry>
<entry>
<title>magit-rebase-insert-merge-sequence: Skip over empty lines</title>
<updated>2025-05-11T20:50:29+00:00</updated>
<author>
<name>Jonas Bernoulli</name>
<email>jonas@bernoul.li</email>
</author>
<published>2025-05-11T20:50:29+00:00</published>
<link rel='alternate' type='text/html' href='http://git.tews.dev/cgit/magit.git/commit/?id=621e69eb9bc3379511d5e6b8bb82094ef8e71cfa'/>
<id>621e69eb9bc3379511d5e6b8bb82094ef8e71cfa</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix typo</title>
<updated>2025-05-11T20:33:30+00:00</updated>
<author>
<name>Jonas Bernoulli</name>
<email>jonas@bernoul.li</email>
</author>
<published>2025-05-11T20:33:30+00:00</published>
<link rel='alternate' type='text/html' href='http://git.tews.dev/cgit/magit.git/commit/?id=a6b968f82f0d68890d5299a4193cfbdaadf62a16'/>
<id>a6b968f82f0d68890d5299a4193cfbdaadf62a16</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Update .dir-locals.el</title>
<updated>2025-05-09T14:44:08+00:00</updated>
<author>
<name>Jonas Bernoulli</name>
<email>jonas@bernoul.li</email>
</author>
<published>2025-05-09T14:44:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.tews.dev/cgit/magit.git/commit/?id=5876192dc6e048ba2ad5576e7a4789e22beb9877'/>
<id>5876192dc6e048ba2ad5576e7a4789e22beb9877</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
