Commit Graph

73 Commits (master)

Author SHA1 Message Date
Junio C Hamano afe8a9070b tree-wide: apply equals-null.cocci 5 months ago
Phillip Wood 4496526f80 xdiff: implement a zealous diff3, or "zdiff3" 10 months ago
Ævar Arnfjörð Bjarmason 5d93460024 xdiff-interface: replace discard_hunk_line() with a flag 1 year ago
Ævar Arnfjörð Bjarmason 9e20442298 xdiff-interface: allow early return from xdiff_emit_line_fn 1 year ago
Ævar Arnfjörð Bjarmason a8d5eb6dc0 xdiff-interface: prepare for allowing early return 1 year ago
brian m. carlson 14228447c9 hash: provide per-algorithm null OIDs 1 year ago
Jeff King 3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer 3 years ago
Jeff King d20bc01a51 avoid computing zero offsets from NULL pointer 3 years ago
Nguyễn Thái Ngọc Duy 5a59a2301f completion: add more parameter value completion 4 years ago
Jeff King 5eade0746e xdiff-interface: drop parse_hunk_header() 4 years ago
Jeff King 7c61e25fbf diff: use hunk callback for word-diff 4 years ago
Jeff King 3b40a090fd diff: avoid generating unused hunk header lines 4 years ago
Jeff King 9346d6d14d xdiff-interface: provide a separate consume callback for hunks 4 years ago
Jeff King 611e42a598 xdiff: provide a separate emit callback for hunks 4 years ago
Jeff King 4a7e27e957 convert "oidcmp() == 0" to oideq() 4 years ago
Stefan Beller cbd53a2193 object-store: move object access functions to object-store.h 4 years ago
brian m. carlson b4f5aca40e sha1_file: convert read_sha1_file to struct object_id 5 years ago
Stefan Beller 5ec8274b84 xdiff-interface: export comparing and hashing strings 5 years ago
Brandon Williams b2141fc1d2 config: don't include config.h by default 5 years ago
Nguyễn Thái Ngọc Duy 5118d7f4e6 print errno when reporting a system call error 5 years ago
Johannes Schindelin b7d36ffca0 regex: use regexec_buf() 6 years ago
brian m. carlson d449347d08 Convert read_mmblob to take struct object_id. 6 years ago
René Scharfe e0876bca4d xdiff: don't trim common tail with -W 6 years ago
Jeff King b32fa95fd8 convert trivial cases to ALLOC_ARRAY 7 years ago
Jeff King dcd1742e56 xdiff: reject files larger than ~1GB 7 years ago
René Scharfe 3319e60633 xdiff: remove emit_func() and xdi_diff_hunks() 11 years ago
Jonathan Nieder 8c2be75fe1 add, merge, diff: do not use strcasecmp to compare config variable names 12 years ago
René Scharfe 5fd898141c close file on error in read_mmfile() 12 years ago
Brandon Casey 1b6ecbad35 xdiff-interface.c: always trim trailing space from xfuncname matches 12 years ago
René Scharfe dfea79004c remove ecb parameter from xdi_diff_outf() 13 years ago
Michael Lukashov 06b65939b0 refactor duplicated fill_mm() in checkout and merge-recursive 13 years ago
René Scharfe 8cfe5f1cd5 userdiff: add xdiff_clear_find_func() 13 years ago
Benjamin Kramer eb3a9dd327 Remove unused function scope local variables 14 years ago
Jim Meyering c095a1db30 xdiff-interface.c: remove 10 duplicated lines 14 years ago
René Scharfe 86295bb6ba add xdi_diff_hunks() for callers that only need hunk lengths 14 years ago
Brandon Casey 563d5a2c84 xdiff-interface.c: strip newline (and cr) from line before pattern matching 14 years ago
Brandon Casey a5a5a04863 xdiff-interface.c: strip newline (and cr) from line before pattern matching 14 years ago
Junio C Hamano 3d8dccd74a diff: fix "multiple regexp" semantics to find hunk header comment 14 years ago
Brandon Casey a013585b20 diff.c: associate a flag with each pattern and use it for compiling regex 14 years ago
Junio C Hamano b541248467 merge.conflictstyle: choose between "merge" and "diff3 -m" styles 14 years ago
Junio C Hamano 8a3f524bf2 xdiff-interface: hide the whole "xdiff_emit_state" business from the caller 14 years ago
Brian Downing b463776086 Use strbuf for struct xdiff_emit_state's remainder 14 years ago
Brian Downing c99db9d292 Make xdi_diff_outf interface for running xdiff_outf diffs 14 years ago
Johannes Schindelin 381b851c9b merge-file: handle empty files gracefully 15 years ago
Jim Meyering 8e0f70033b Avoid unnecessary "if-before-free" tests. 15 years ago
Linus Torvalds d2f82950a9 Re(-re)*fix trim_common_tail() 15 years ago
Junio C Hamano 079fe1dae8 Re-re-re-fix common tail optimization 15 years ago
Jeff King 5249997735 trim_common_tail: brown paper bag fix. 15 years ago
Junio C Hamano 29ab27f4b5 xdiff tail trimming: use correct type. 15 years ago
Junio C Hamano 913b45f51b xdi_diff: trim common trailing lines 15 years ago