diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-12-26 18:45:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-26 18:45:30 -0800 |
| commit | 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70 (patch) | |
| tree | ff61e0bd4d4454a4b34e920f80dbc1b4e427383d /diffcore-rename.c | |
| parent | Merge branch 'jc/checkout' (diff) | |
| parent | GIT 1.0.5 (diff) | |
| download | tgif-36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70.tar.xz | |
Merge fixes up to GIT 1.0.5
Diffstat (limited to 'diffcore-rename.c')
| -rw-r--r-- | diffcore-rename.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index dba965c0b4..39d9126cb9 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -282,7 +282,7 @@ void diffcore_rename(struct diff_options *options) else if (detect_rename == DIFF_DETECT_COPY) register_rename_src(p->one, 1); } - if (rename_dst_nr == 0 || + if (rename_dst_nr == 0 || rename_src_nr == 0 || (0 < rename_limit && rename_limit < rename_dst_nr)) goto cleanup; /* nothing to do */ |