summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2013-07-17 16:55:00 -0500
committerEdward Thomson <ethomson@microsoft.com>2013-07-17 16:55:00 -0500
commitd55bed1a253a9f914521c29b9a2d2517a79c034d (patch)
tree3644a60058e1efba10ebf24378c882a31281351c
parent4e05fa7db4a24f47f37539f58168242c68b5b821 (diff)
downloadlibgit2-d55bed1a253a9f914521c29b9a2d2517a79c034d.tar.gz
don't include ignored as rename candidates
-rw-r--r--src/diff_tform.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/diff_tform.c b/src/diff_tform.c
index b137bd319..ac5356a8c 100644
--- a/src/diff_tform.c
+++ b/src/diff_tform.c
@@ -590,11 +590,13 @@ static bool is_rename_target(
return false;
case GIT_DELTA_UNTRACKED:
- case GIT_DELTA_IGNORED:
if (!FLAG_SET(opts, GIT_DIFF_FIND_FOR_UNTRACKED))
return false;
break;
+ case GIT_DELTA_IGNORED:
+ return false;
+
default: /* all other status values should be checked */
break;
}