Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 367084

Summary: http://orionhub.org/git/git-status.html#undefined
Product: [ECD] Orion Reporter: John J. Barton <johnjbarton>
Component: GitAssignee: Malgorzata Janczarska <malgorzata.tomczyk>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: malgorzata.tomczyk, Szymon.Brandys, tomasz.zarna
Version: 0.4Keywords: investigate
Target Milestone: 0.4 RC2Flags: Szymon.Brandys: review+
Hardware: PC   
OS: All   
Whiteboard:
Attachments:
Description Flags
Screenshot after I click the merge button
none
Merge command message changed. none

Description John J. Barton CLA 2011-12-19 10:28:51 EST 
If I have a conflict after fetch+merge, then the git-status.html page has a link telling me to go to the git-status page (which is confusing, I'm already on the Git Status page). If I click the link I get an error message. The link is
http://orionhub.org/git/git-status.html#undefined
Comment 1 John J. Barton CLA 2011-12-20 14:15:16 EST 
Created attachment 208640 [details]
Screenshot after I click the merge button
Comment 2 Malgorzata Janczarska CLA 2012-02-15 08:15:25 EST 
Created attachment 211044 [details]
Merge command message changed.

The problem required doing a trivial fix in code, because there was an uninitialized variable. It was repeated in merge command for git-satus and git-log. But as you mentioned when we are on git-status telling the user to go to Git Status made no sense, so I removed that hint from error message.
The error reporting for merge error is still far from usable so I opened Bug 371607 and Bug 371617, but I don't think they will be fixed in 0.4 as they usually need (or are a part) of more extensive changes.
Comment 3 Szymon Brandys CLA 2012-02-15 11:02:28 EST 
Looks good.
Comment 4 Tomasz Zarna CLA 2012-02-15 11:23:04 EST 
*** Bug 370852 has been marked as a duplicate of this bug. ***
Comment 5 Malgorzata Janczarska CLA 2012-02-15 11:41:15 EST 
Done, John, can you verify if it helped for Bug 370852 as whell?