Bug 343593

Description Benjamin Muskalla 2011-04-21 13:17:04 EDT

What steps will reproduce the problem?
1. Branch without merge configuration
2. Invoke pull
3. Error message that the current branch is not configured for pull

We should help the user to configure pull in this case instead of failing with an error log message.


-- Error Details --
Date: Thu Apr 21 16:28:08 CEST 2011
Message: The current branch is not configured for pull
Severity: Error
Product: Eclipse SDK 3.7.0.v201008051700 (org.eclipse.sdk.ide)
Plugin: org.eclipse.egit.ui
Session Data:
eclipse.buildId=I20100805-1700
java.version=1.6.0_24
java.vendor=Sun Microsystems Inc.
BootLoader constants: OS=linux, ARCH=x86, WS=gtk, NL=en_US
Command-line arguments:  -os linux -ws gtk -arch x86


Exception Stack Trace:
org.eclipse.jgit.api.errors.InvalidConfigurationException: No value for key branch.bugReports.merge found in configuration
at org.eclipse.jgit.api.PullCommand.call(PullCommand.java:189)
at org.eclipse.egit.core.op.PullOperation$1.run(PullOperation.java:82)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1975)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1957)
at org.eclipse.egit.core.op.PullOperation.execute(PullOperation.java:104)
at org.eclipse.egit.ui.internal.pull.PullOperationUI.execute(PullOperationUI.java:115)
at org.eclipse.egit.ui.internal.pull.PullOperationUI$1.run(PullOperationUI.java:90)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)