diff options
author | Stefan Lay | 2010-03-11 13:53:31 +0000 |
---|---|---|
committer | Code Review | 2010-03-11 13:53:31 +0000 |
commit | 86df94e89fcf3d308d04c348f840be116c55ead0 (patch) | |
tree | 3ddce8222cf92f09e99ee25488d844f511c77fe5 | |
parent | 25f1acdd2f2176380aaac397f69597e3e26c9f0b (diff) | |
parent | 56f45a8aae30c53c693762e7de339062dffe329a (diff) | |
download | egit-86df94e89fcf3d308d04c348f840be116c55ead0.tar.gz egit-86df94e89fcf3d308d04c348f840be116c55ead0.tar.xz egit-86df94e89fcf3d308d04c348f840be116c55ead0.zip |
Merge "Fix NPE in CommitDialog.getFileStatus() on first commit"
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java index de550da0bf..dcc8c6cb1e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java @@ -413,8 +413,8 @@ public class CommitDialog extends Dialog { Tree headTree = repo.mapTree(Constants.HEAD); String repoPath = repositoryMapping.getRepoRelativePath(file); - TreeEntry headEntry = headTree.findBlobMember(repoPath); - boolean headExists = headTree.existsBlob(repoPath); + TreeEntry headEntry = (headTree == null ? null : headTree.findBlobMember(repoPath)); + boolean headExists = (headTree == null ? false : headTree.existsBlob(repoPath)); Entry indexEntry = index.getEntry(repoPath); if (headEntry == null) { |