Commit d2db351cf6b597bf3eaddaa4660ae426a4b4228d

Vicent Martí 2013-07-17T16:12:15

Merge pull request #1735 from ethomson/ignored_are_not_rename_candidates don't include ignored as rename candidates

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
diff --git a/src/diff_tform.c b/src/diff_tform.c
index b137bd3..ac5356a 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;
 	}