diff options
| author | Chris Aniszczyk <caniszczyk@gmail.com> | 2010-11-07 16:09:00 -0500 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2010-11-07 16:09:00 -0500 |
| commit | d6fec1988c306333f5638bd2f35895d732b31e73 (patch) | |
| tree | faf8cc65f0d3c518944ef2dd13c6fd4426984f86 | |
| parent | 83019318c642849857c3189c6d4dd3485d0fa639 (diff) | |
| parent | 220cd43482c803b2e1ba6cdacc6e03644658b737 (diff) | |
| download | jgit-d6fec1988c306333f5638bd2f35895d732b31e73.tar.gz jgit-d6fec1988c306333f5638bd2f35895d732b31e73.zip | |
Merge "[findBugs] Fix NP_LOAD_OF_KNOWN_NULL_VALUE"
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java index c7b9eb5db0..5b71dc091f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -406,7 +406,7 @@ public class DirCacheCheckout { // File/Directory conflict case #20 if (walk.isDirectoryFileConflict()) // TODO: check whether it is always correct to report a conflict here - conflict(name, null, h, m); + conflict(name, null, null, null); // file only exists in working tree -> ignore it return; |