Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,7 @@ LIB_OBJS += prune-packed.o
LIB_OBJS += pseudo-merge.o
LIB_OBJS += quote.o
LIB_OBJS += range-diff.o
LIB_OBJS += range-set.o
LIB_OBJS += reachable.o
LIB_OBJS += read-cache.o
LIB_OBJS += rebase-interactive.o
Expand Down Expand Up @@ -1533,6 +1534,7 @@ CLAR_TEST_SUITES += u-oid-array
CLAR_TEST_SUITES += u-oidmap
CLAR_TEST_SUITES += u-oidtree
CLAR_TEST_SUITES += u-prio-queue
CLAR_TEST_SUITES += u-range-set
CLAR_TEST_SUITES += u-reftable-basics
CLAR_TEST_SUITES += u-reftable-block
CLAR_TEST_SUITES += u-reftable-merged
Expand Down
1 change: 1 addition & 0 deletions diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "quote.h"
#include "diff.h"
#include "diffcore.h"
#include "range-set.h"
#include "delta.h"
#include "hex.h"
#include "xdiff-interface.h"
Expand Down
12 changes: 1 addition & 11 deletions diffcore.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
struct diff_options;
struct mem_pool;
struct oid_array;
struct range_set;
struct repository;
struct strintmap;
struct strmap;
Expand All @@ -19,17 +20,6 @@ struct userdiff_driver;
* in anything else.
*/

/* A range [start, end). Lines are numbered starting at 0. */
struct range {
long start, end;
};

/* A set of ranges. The ranges must always be disjoint and sorted. */
struct range_set {
unsigned int alloc, nr;
struct range *ranges;
};

/* We internally use unsigned short as the score value,
* and rely on an int capable to hold 32-bits. -B can take
* -Bmerge_score/break_score format and the two scores are
Expand Down
Loading
Loading