diff options
| author | Mathias Kinzler | 2011-01-13 14:51:00 +0000 |
|---|---|---|
| committer | Code Review | 2011-01-13 14:51:00 +0000 |
| commit | 8d7705d2709e80ea50f9115c2abbca98e9d9344c (patch) | |
| tree | bf39385bb56ed182f73d830a1ed4f0a5b43a7f84 | |
| parent | acb7df1d7583404aa3cc997a7b6e66e039fbe82e (diff) | |
| parent | e48741275f61ab2e85dc17b3689a7e7e72f994da (diff) | |
| download | egit-8d7705d2709e80ea50f9115c2abbca98e9d9344c.tar.gz egit-8d7705d2709e80ea50f9115c2abbca98e9d9344c.tar.xz egit-8d7705d2709e80ea50f9115c2abbca98e9d9344c.zip | |
Merge "Replace with->File in Git Index: ignore untracked files"
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java | 7 | ||||
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java index 29404c30d2..1597b64216 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java @@ -44,6 +44,7 @@ import org.eclipse.osgi.util.NLS; /** * The operation discards changes on a set of resources. In case of a folder * resource all file resources in the sub tree are processed. + * Untracked files are ignored. */ public class DiscardChangesOperation implements IEGitOperation { @@ -158,8 +159,10 @@ public class DiscardChangesOperation implements IEGitOperation { DirCache dc = repository.lockDirCache(); try { DirCacheEntry entry = dc.getEntry(resRelPath); - File file = new File(res.getLocationURI()); - DirCacheCheckout.checkoutEntry(repository, file, entry); + if (entry != null) { + File file = new File(res.getLocationURI()); + DirCacheCheckout.checkoutEntry(repository, file, entry); + } } finally { dc.unlock(); } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties index d5e0461d7e..ad6cdc26b8 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties @@ -759,7 +759,7 @@ RepositoriesViewLabelProvider_SymbolicRefNodeText=References RepositoriesViewLabelProvider_TagsNodeText=Tags DiscardChangesAction_confirmActionTitle=Discard Local Changes -DiscardChangesAction_confirmActionMessage=This will discard all local changes for the selected resources. Are you sure you want to do this ? +DiscardChangesAction_confirmActionMessage=This will discard all local changes for the selected resources. Untracked files will be ignored. Are you sure you want to do this? DiscardChangesAction_discardChanges=Discard Changes Disconnect_disconnect=Disconnect |