From 67db583dabf6e154037302a24b7f79028f403454 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Thu, 23 May 2013 15:06:07 -0700 Subject: More diff rename tests; better split swap handling This adds a couple more tests of different rename scenarios. Also, this fixes a problem with the case where you have two "split" deltas and the left half of one matches the right half of the other. That case was already being handled, but in the wrong order in a way that could result in bad output. Also, if the swap also happened to put the other two halves into the correct place (i.e. two files exchanged places with each other), then the second delta was left with the SPLIT flag set when it really should be cleared. --- include/git2/diff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/git2/diff.h') diff --git a/include/git2/diff.h b/include/git2/diff.h index 6939f6a2e..0d4875b43 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -484,7 +484,7 @@ typedef struct { unsigned int version; /** Combination of git_diff_find_t values (default FIND_RENAMES) */ - unsigned int flags; + uint32_t flags; /** Similarity to consider a file renamed (default 50) */ uint16_t rename_threshold; -- cgit v1.2.1