diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-01 06:22:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-02 10:24:46 (GMT) |
| commit | b45563a229f5150271837cf487a91ddd8224fbd3 (patch) | |
| tree | a0b363c225777490a4c22adaf280ea7ef69f7772 /diffcore-break.c | |
| parent | 1c46ab1fada6eb449336a624995293cdd74f2b08 (diff) | |
| download | git-b45563a229f5150271837cf487a91ddd8224fbd3.zip git-b45563a229f5150271837cf487a91ddd8224fbd3.tar.gz git-b45563a229f5150271837cf487a91ddd8224fbd3.tar.bz2 | |
rename: Break filepairs with different types.
When we consider if a path has been totally rewritten, we did not
touch changes from symlinks to files or vice versa. But a change
that modifies even the type of a blob surely should count as a
complete rewrite.
While we are at it, modernise diffcore-break to be aware of gitlinks (we
do not want to touch them).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-break.c')
| -rw-r--r-- | diffcore-break.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/diffcore-break.c b/diffcore-break.c index c71a226..31cdcfe 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -52,8 +52,10 @@ static int should_break(struct diff_filespec *src, * is the default. */ - if (!S_ISREG(src->mode) || !S_ISREG(dst->mode)) - return 0; /* leave symlink rename alone */ + if (S_ISREG(src->mode) != S_ISREG(dst->mode)) { + *merge_score_p = (int)MAX_SCORE; + return 1; /* even their types are different */ + } if (src->sha1_valid && dst->sha1_valid && !hashcmp(src->sha1, dst->sha1)) @@ -168,11 +170,13 @@ void diffcore_break(int break_score) struct diff_filepair *p = q->queue[i]; int score; - /* We deal only with in-place edit of non directory. + /* + * We deal only with in-place edit of blobs. * We do not break anything else. */ if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two) && - !S_ISDIR(p->one->mode) && !S_ISDIR(p->two->mode) && + object_type(p->one->mode) == OBJ_BLOB && + object_type(p->two->mode) == OBJ_BLOB && !strcmp(p->one->path, p->two->path)) { if (should_break(p->one, p->two, break_score, &score)) { |