Merge branch 'bp/diff-no-index-strbuf-fix'