Bug 343593 - Pull on branch without merge strategy should provide help instead of failing
Summary: Pull on branch without merge strategy should provide help instead of failing
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 enhancement with 1 vote (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords: helpwanted
: 343638 (view as bug list)
Depends on:
Blocks:
 
Reported: 2011-04-21 13:17 EDT by Benjamin Muskalla CLA
Modified: 2013-10-25 09:03 EDT (History)
4 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Benjamin Muskalla CLA 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)
Comment 1 Robin Stocker CLA 2013-09-28 12:04:11 EDT
*** Bug 343638 has been marked as a duplicate of this bug. ***
Comment 2 Denis Roy CLA 2013-10-25 09:03:24 EDT
I just got hit by this too.  Linking back to the forum post that brought me here:

http://www.eclipse.org/forums/index.php/m/819660/