Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2018-02-04 07:11:48 -0500
committerMatthias Sohn2018-02-12 19:16:10 -0500
commit5275b0cf386c8c3383b26c5e7aa25aa39281eeeb (patch)
treeeafad488410faec5261d43f0b1589cd292458b8d /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
parent83758204267e3768c67aed2a4683f747bcffea0c (diff)
downloadegit-5275b0cf386c8c3383b26c5e7aa25aa39281eeeb.tar.gz
egit-5275b0cf386c8c3383b26c5e7aa25aa39281eeeb.tar.xz
egit-5275b0cf386c8c3383b26c5e7aa25aa39281eeeb.zip
Prevent MissingObjectException being logged in ref content proposal
If we do ref content proposal for upstream refs, it's possible that we don't have the referenced commit locally because it wasn't fetched yet. Logging a MissingObjectException in this case is misleading. Check explicitly for this and produce a description that explains this. Change-Id: I211f906ac2fe9dedb3fc86eaf804ff4f7a6ca0c0 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index 0a210085ae..29e2c0f579 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -542,6 +542,7 @@ RefContentProposal_tag=tag
RefContentProposal_trackingBranch=tracking branch
RefContentProposal_tree=tree
RefContentProposal_unknownObject=locally unknown object
+RefContentProposal_unknownRemoteObject=locally unknown object: upstream is ahead of local repository and hasn't been fetched yet
ReflogView_DateColumnHeader=Date
ReflogView_ErrorOnLoad=Loading the reflog encountered an error; see the Error Log for more information
ReflogView_ErrorOnOpenCommit=Error opening commit

Back to the top