diff options
| author |  Tassilo Horn <tsdh@gnu.org> | 2021-08-11 19:51:04 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-11 11:11:30 -0700 |
| commit | a8cbc895893f4c244e54374d3bf937819fb6e2e9 (patch) | |
| tree | bd64b7138c041098729e792130e4a7a9cb620ac0 /git-mergetool.sh | |
| parent | Git 2.33-rc1 (diff) | |
| download | tgif-a8cbc895893f4c244e54374d3bf937819fb6e2e9.tar.xz | |
userdiff: improve java hunk header regex
Currently, the git diff hunk headers show the wrong method signature if the
method has a qualified return type, an array return type, or a generic return
type because the regex doesn't allow dots (.), [], or < and > in the return
type. Also, type parameter declarations couldn't be matched.
Add several t4018 tests asserting the right hunk headers for different cases:
- enum constant change
- change in generic method with bounded type parameters
- change in generic method with wildcard
- field change in a nested class
Signed-off-by: Tassilo Horn <tsdh@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions