diff --git a/diff.c b/diff.c index dd1c0b6d55ded16509e8ea5f6cfd1ce5e770e22c..d6661f82684fac739513bd7fea710c98c8f80663 100644 --- a/diff.c +++ b/diff.c @@ -662,6 +662,7 @@ struct diff_filepair *diff_queue(struct diff_queue_struct *queue, dp->one = one; dp->two = two; dp->score = 0; + dp->status = 0; dp->source_stays = 0; dp->broken_pair = 0; diff_q(queue, dp); diff --git a/diffcore-rename.c b/diffcore-rename.c index 19325f245c251b7a1bd6bd585eb05d7e3f51ca44..8fb45f0b8706baa6a1190b21d723d0b0d81203c5 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -249,8 +249,14 @@ void diffcore_rename(int detect_rename, int minimum_score) continue; /* unmerged */ else locate_rename_dst(p->two, 1); - else if (!DIFF_FILE_VALID(p->two)) - register_rename_src(p->one, 0); + else if (!DIFF_FILE_VALID(p->two)) { + /* If the source is a broken "delete", and + * they did not really want to get broken, + * that means the source actually stays. + */ + int stays = (p->broken_pair && !p->score); + register_rename_src(p->one, stays); + } else if (detect_rename == DIFF_DETECT_COPY) register_rename_src(p->one, 1); }