Re: [PATCH v2 4/4] diff.c: convert builtin funcname patterns to non-GNU extended regex syntax

Shawn,

When you get around to merging this series into maint and master, you'll probably want to redo the merge of Junio's bc/maint-diff-hunk-header-fix into bc/master-diff-hunk-header-fix.

After applying 'diff hunkpattern: fix misconverted "\{" tex macro introducers' to bc/maint-diff-hunk-header-fix, he made a mistake when merging 96d1a8e9 into his bc/master-diff-hunk-header-fix which was at 3d8dccd7 to produce 92bb9785. (gitk fdac6692 makes this easier to see. fdac6692 should be the current tip of bc/master-diff-hunk...)

The resulting diff.c in 92bb9785, contains _two_ bibtex patterns, one fixed by the 'diff hunkpattern:...' patch, and one unfixed. The broken bibtex pattern was eventually fixed, but the duplicate pattern is still there on the tip of that branch and in next. It would be nice if the merge could be redone.

Here are the commands, since sometimes it makes more sense this way:

git branch bc/maint-diff-hunk-header-fix 96d1a8e9 git checkout -b bc/master-diff-hunk-header-fix 3d8dccd7 git merge bc/maint-diff-hunk-header-fix # fix conflict, make sure you choose the right bibtex pattern # and delete the other. The builtin-funcname patterns were # also alphabetized on the master branch, so the correct bibtex # should be moved to the first entry.

# then reapply the other two patches git checkout bc/maint-diff-hunk-header-fix git cherry-pick e3bf5e43 git checkout bc/master-diff-hunk-header-fix git merge bc/maint-diff-hunk-header-fix git cherry-pick fdac6692 git commit --amend # Remove Junio's comment about 'fixes bibtex pattern breakage exposed # by this test'

-brandon