diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-08-13 04:33:04 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-13 10:44:50 -0700 |
commit | d9c66f0b5bfdf3fc2898b7baad1bb9a72bfd7bf7 (patch) | |
tree | e955ac801228078a74f9de856dcb57bbd600da53 /Makefile | |
parent | Introduce `range-diff` to compare iterations of a topic branch (diff) | |
download | tgif-d9c66f0b5bfdf3fc2898b7baad1bb9a72bfd7bf7.tar.xz |
range-diff: first rudimentary implementation
At this stage, `git range-diff` can determine corresponding commits
of two related commit ranges. This makes use of the recently introduced
implementation of the linear assignment algorithm.
The core of this patch is a straight port of the ideas of tbdiff, the
apparently dormant project at https://github.com/trast/tbdiff.
The output does not at all match `tbdiff`'s output yet, as this patch
really concentrates on getting the patch matching part right.
Note: due to differences in the diff algorithm (`tbdiff` uses the Python
module `difflib`, Git uses its xdiff fork), the cost matrix calculated
by `range-diff` is different (but very similar) to the one calculated
by `tbdiff`. Therefore, it is possible that they find different matching
commits in corner cases (e.g. when a patch was split into two patches of
roughly equal length).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -925,6 +925,7 @@ LIB_OBJS += progress.o LIB_OBJS += prompt.o LIB_OBJS += protocol.o LIB_OBJS += quote.o +LIB_OBJS += range-diff.o LIB_OBJS += reachable.o LIB_OBJS += read-cache.o LIB_OBJS += reflog-walk.o |