Doing it so simply depends on the subdir moves being noticed later,
this fixes only one of the remaining failing testcases. Doing better
requires real handling of deep trees, which is addressed by next
patch, but add much complexity.
Signed-off-by: Yann Dirson <ydirson@xxxxxxx>
---
diffcore-rename.c | 59 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 14 deletions(-)
diff --git a/diffcore-rename.c b/diffcore-rename.c
index f252da7..1be1af1 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -596,10 +596,52 @@ static void check_one_bulk_move(struct diff_filepair *dstpair)
maybe_disqualify_bulkmove(one_parent_path, one_leftover))
return;
+ fprintf(stderr, "[] %s -> %s ?\n",dstpair->one->path, dstpair->two->path);
+
+ // FIXME: loop over successive prefixes
+ unsigned needs_adding = 1;
+
/* already considered ? */
- for (seen=bulkmove_candidates; seen; seen = seen->next)
- if (!strcmp(seen->one->path, one_parent_path)) break;
- if (!seen) { /* record potential dir rename */
+ for (seen=bulkmove_candidates; seen; seen = seen->next) {
+ if (seen->discarded) {
+ /* already seen a rename from seen->one to some than ->two */
+ needs_adding = 0;
+ continue;
+ }
+ /* check exact dir */
+ if (!strcmp(seen->one->path, one_parent_path)) {
+ /* already added */
+ needs_adding = 0;
+ /* check that seen entry matches this rename */
+ if (strcmp(two_parent_path, seen->two->path)) {
+ fprintf(stderr, "[DBG] discarding dir %s from bulk moves (split into %s and %s)\n",
+ seen->one->path, two_parent_path, seen->two->path);
+ // FIXME: may be worth to free it instead
+ seen->discarded = 1;
+ }
+ continue;
+ }
+ if (!prefixcmp(one_parent_path, seen->one->path)) {
+ if (prefixcmp(two_parent_path, seen->two->path)) {
+ fprintf(stderr, "[DBG] discarding dir %s from bulk moves (split into %s and %s)\n",
+ seen->one->path, two_parent_path, seen->two->path);
+ // FIXME: may be worth to free it instead
+ seen->discarded = 1;
+ continue;
+ }
+ } else {
+ fprintf(stderr, "[DBG] %s considered irrelevant for %s -> %s\n",
+ dstpair->one->path, seen->one->path, seen->two->path);
+ continue;
+ }
+
+ /* dstpair confirms seen */
+ fprintf(stderr, "[DBG] %s -> %s DOES NOT cause discard of %s -> %s\n",
+ dstpair->one->path, dstpair->two->path,
+ seen->one->path, seen->two->path);
+ }
+ if (needs_adding) { /* record potential dir rename */
+ /* all checks ok, we keep that entry */
seen = xmalloc(sizeof(*seen));
seen->one = alloc_filespec(one_parent_path);
fill_filespec(seen->one, null_sha1, S_IFDIR);
@@ -614,17 +656,6 @@ static void check_one_bulk_move(struct diff_filepair *dstpair)
one_parent_path, two_parent_path);
return;
}
- if (seen->discarded)
- /* already seen a rename from seen->one to some than ->two */
- return;
- /* check that seen entry matches this rename */
- if (strcmp(two_parent_path, seen->two->path)) {
- fprintf(stderr, "[DBG] discarding dir %s from bulk moves (split into %s and %s)\n",
- one_parent_path, two_parent_path, seen->two->path);
- seen->discarded = 1;
- }
-
- /* all checks ok, we keep that entry */
}
/*
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html