Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 05:55:44 +01:00
Code Issues Packages Projects Releases Activity

Fix reminders of dry run

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-07 10:33:47 +01:00
parent 33642352ea
commit 62c20b071b
3 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-core/src/main/java/sonia/scm/repository/api/Command.java
View File

@@ -71,10 +71,5 @@ public enum Command
/** /**
* @since 2.0 * @since 2.0
*/ */
MERGE, MERGE
/**
* @since 2.0
*/
MERGE_DRY_RUN
} }

8
scm-core/src/main/java/sonia/scm/repository/spi/RepositoryServiceProvider.java
View File

@@ -259,12 +259,4 @@ public abstract class RepositoryServiceProvider implements Closeable
{ {
throw new CommandNotSupportedException(Command.MERGE); throw new CommandNotSupportedException(Command.MERGE);
} }
/**
* @since 2.0
*/
public MergeDryRunCommand getMergeDryRunCommand()
{
throw new CommandNotSupportedException(Command.MERGE_DRY_RUN);
}
} }

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
View File

@@ -64,7 +64,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
Command.OUTGOING, Command.OUTGOING,
Command.PUSH, Command.PUSH,
Command.PULL, Command.PULL,
Command.MERGE_DRY_RUN Command.MERGE
); );
//J+ //J+