Noticed by Anton Nefedov <email@example.com>. Cherry-pick patch to follow once it's in master.
Created attachment 14055 [details]
git-am fix for 4.8.next, 4.7.next, 4.6.next.
Cherry-picked from master.
Pushed to autobuild-v4-[8,7,6]-test.
Pushed to v4-8-test and v4-7-test, re-trying autobuild-v4-6-test.
(In reply to Karolin Seeger from comment #3)
Pushed to all branches.
Closing out bug report.