Merge pull request #1735 from ethomson/ignored_are_not_rename_candidates

don't include ignored as rename candidates
This commit is contained in:
Vicent Martí 2013-07-17 16:12:15 -07:00
commit d2db351cf6

View File

@ -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;
}