git/t/lib-diff-alternative.sh, branch v2.40.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.40.22023-02-21T17:29:10Zdiff: teach diff to read algorithm from diff driver2023-02-21T17:29:10ZJohn Caijohncai86@gmail.com2023-02-20T21:04:42Zurn:sha1:a4cf900ee734ce9bb73d57c5dfbb1da4a5a88bd3
It can be useful to specify diff algorithms per file type. For example,
one may want to use the minimal diff algorithm for .json files, another
for .c files, etc.
The diff machinery already checks attributes for a diff driver. Teach
the diff driver parser a new type "algorithm" to look for in the
config, which will be used if a driver has been specified through the
attributes.
Enforce precedence of the diff algorithm by favoring the command line
option, then looking at the driver attributes & config combination, then
finally the diff.algorithm config.
To enforce precedence order, use a new `ignore_driver_algorithm` member
during options parsing to indicate the diff algorithm was set via command
line args.
Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/lib-diff-alternative: abstract away SHA-1-specific constants2018-05-21T04:55:48Zbrian m. carlsonsandals@crustytoothpaste.net2018-05-21T02:01:42Zurn:sha1:d29d5001e9614871e05410362b20e1f0a76157a6
Adjust the test code so that it computes variables for blobs instead of
using hard-coded hashes. This makes t4033 and t4050 (the patience and
histogram tests) pass.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
test: replace shebangs with descriptions in shell libraries2013-11-26T22:23:52ZJonathan Niederjrnieder@gmail.com2013-11-25T21:03:06Zurn:sha1:c74c72034f061d1d9d5b8b1fba20ce0138d423b4
A #! line in these files is misleading, since these scriptlets are
meant to be sourced with '.' (using whatever shell sources them)
instead of run directly using the interpreter named on the #! line.
Removing the #! line shouldn't hurt syntax highlighting since
these files have filenames ending with '.sh'. For documentation,
add a brief description of how the files are meant to be used in
place of the shebang line.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t4033-diff-patience: factor out tests2011-07-07T16:41:48ZTay Ray Chuanrctay89@gmail.com2011-07-07T04:23:58Zurn:sha1:46c8f2988dc9a6012babd5833a6245ceff214483
Group the test cases into two functions, test_diff_(frobnitz|unique).
This in preparation for the histogram diff algorithm, which would also
re-use these test cases.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>