diff options
| author | njames <nkskjames@gmail.com> | 2017-01-09 11:25:43 -0600 |
|---|---|---|
| committer | njames <nkskjames@gmail.com> | 2017-01-09 11:25:43 -0600 |
| commit | 75735adde51b4962a319eb5833c3bc46a71f750f (patch) | |
| tree | 1f7a347be914e84511ebfe9c329b94fa6969ddc3 /src | |
| parent | f98655bb1ad441d1a0036d2208ca5b6fda989a66 (diff) | |
| download | serverwiz-75735adde51b4962a319eb5833c3bc46a71f750f.tar.gz serverwiz-75735adde51b4962a319eb5833c3bc46a71f750f.zip | |
Rebase always even after a reset
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/ibm/ServerWizard2/utility/GithubRepository.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/com/ibm/ServerWizard2/utility/GithubRepository.java b/src/com/ibm/ServerWizard2/utility/GithubRepository.java index 52c7871..40dfbd3 100644 --- a/src/com/ibm/ServerWizard2/utility/GithubRepository.java +++ b/src/com/ibm/ServerWizard2/utility/GithubRepository.java @@ -153,14 +153,13 @@ public class GithubRepository implements Comparable<GithubRepository> { ServerWizard2.LOGGER.info(fetch.getMessages());
if (reset) {
ServerWizard2.LOGGER.info("Resetting to head: " + this.getRemoteUrl());
- result.reset().setMode(ResetType.HARD).call();
+ result.reset().setMode(ResetType.HARD).setRef("refs/remotes/origin/master").call();
rstr = "Reset Complete";
- } else {
- ServerWizard2.LOGGER.info("Rebase: " + this.getRemoteUrl());
- RebaseResult r = result.rebase().setUpstream("refs/remotes/origin/master").call();
- rstr = r.getStatus().toString();
- ServerWizard2.LOGGER.info(rstr);
}
+ ServerWizard2.LOGGER.info("Rebase: " + this.getRemoteUrl());
+ RebaseResult r = result.rebase().setUpstream("refs/remotes/origin/master").call();
+ rstr = r.getStatus().toString();
+ ServerWizard2.LOGGER.info(rstr);
result.close();
} catch (Exception e1) {
passwordValidated = false;
|
