fyi this patch applied, but I got the following warning from git:

Applying: emacs: Test for thread-outlining
/home/jrollins/src/notmuch/git/.git/rebase-apply/patch:16: space before tab in indent.
 	   (switch-to-buffer notmuch-show-outline-buffer)
warning: 1 line adds whitespace errors.