diff options
| author | Vicent Martà <vicent@github.com> | 2013-07-17 16:12:15 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-07-17 16:12:15 -0700 |
| commit | d2db351cf6b597bf3eaddaa4660ae426a4b4228d (patch) | |
| tree | 3644a60058e1efba10ebf24378c882a31281351c /src | |
| parent | 4e05fa7db4a24f47f37539f58168242c68b5b821 (diff) | |
| parent | d55bed1a253a9f914521c29b9a2d2517a79c034d (diff) | |
| download | libgit2-d2db351cf6b597bf3eaddaa4660ae426a4b4228d.tar.gz | |
Merge pull request #1735 from ethomson/ignored_are_not_rename_candidates
don't include ignored as rename candidates
Diffstat (limited to 'src')
| -rw-r--r-- | src/diff_tform.c | 4 |
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; } |