diff options
author | Junio C Hamano <junkio@cox.net> | 2005-12-27 05:44:15 +0300 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-12-27 05:44:15 +0300 |
commit | e5f5219a4f1faf3b4e1816fad3a6296a1d39b878 (patch) | |
tree | e41c6fb839732b2fe45bd9416a22411ed3035a07 /diffcore-rename.c | |
parent | 6ab58895cd951f6f5c96fa432afb122cfeb12746 (diff) | |
parent | 975b31dc6e12fba8f7b067ddbe32230995e05400 (diff) |
GIT 1.0.5v1.0.5
Minor fixes.
Starting from this one I won't be touching debian/ directory
since the official maintainer seems to be reasonably quick to
package up things. The packaging procedure used there seems to
be quite different from what I have, so I'd like to avoid
potential confusion and reduce work by the official maintainer
and myself.
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 */ |