Created attachment 13782 [details] git-am fix for master. Includes regression test for 'volume' command.
Created attachment 13783 [details] git-am fix for 4.7.next. Backported from master.
Created attachment 13785 [details] git-am fix for 4.6.next. Back-ported from master.
NB. These patches depend on the patch from bug #13138 being applied first. Jeremy.
Comment on attachment 13785 [details] git-am fix for 4.6.next. This only adds the test. I think you wanted just the code change without the test :-)
Created attachment 13788 [details] Fixed git-am fix for 4.6.next. Argh ! I did the back-port then did the git format-patch from the wrong refspec, sorry. Here's the complete patch (including test :-).
Karolin, please add the patches to the 4.6 and 4.7. Thanks!
(In reply to Andreas Schneider from comment #7) Pushed to autobuild-v4-{7,6}-test.
Pushed to both branches. Closing out bug report. Thanks!