diff options
| author | Markus Duft <markus.duft@salomon.at> | 2012-03-09 13:36:53 +0100 |
|---|---|---|
| committer | Stefan Lay <stefan.lay@sap.com> | 2012-03-09 13:56:37 +0100 |
| commit | edc1fee033a23189742cea1807d8029d1b77da00 (patch) | |
| tree | 41ab32eb98c85110863877308ce0983e6eae437d /org.eclipse.jgit.junit/src/org/eclipse | |
| parent | c1ed9483ff77487b38587a96a74b6ebb813985da (diff) | |
| download | jgit-edc1fee033a23189742cea1807d8029d1b77da00.tar.gz jgit-edc1fee033a23189742cea1807d8029d1b77da00.zip | |
Fix rebase > continue when nothing left to commit.
If after resolving all conflicts nothing is left to commit, return
an according result, so that downstreams (EGit, ...) can behave like
cgit, and display a nice message informing the user.
Currently, EGit displays a "HEAD advanced fast forward" message, which
is absolutely not helpful at all.
This is the basic API revamping required to get that state communicated
to the outside world (EGit).
Bug: 336812
Change-Id: If2665005cf54a5b51c0fe80bad019fa42b0205af
Diffstat (limited to 'org.eclipse.jgit.junit/src/org/eclipse')
0 files changed, 0 insertions, 0 deletions