From a04ee8fccc5f095bf34fe69ab9dd34db966cbff2 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 2 May 2014 13:20:24 +0200 Subject: [PATCH] GitOperations now does a reset before pulling latest changes on train update. --- .../springframework/data/release/git/GitOperations.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/data/release/git/GitOperations.java b/src/main/java/org/springframework/data/release/git/GitOperations.java index 1c80a2d..d067486 100644 --- a/src/main/java/org/springframework/data/release/git/GitOperations.java +++ b/src/main/java/org/springframework/data/release/git/GitOperations.java @@ -113,11 +113,8 @@ public class GitOperations { update(module.getProject()).get(); - String checkoutCommand = String.format("git checkout %s", branch); + String checkoutCommand = String.format("git checkout %s && git pull origin %s", branch, branch); osCommandOperations.executeCommand(checkoutCommand, module.getProject()).get(); - - String updateCommand = String.format("git pull origin %s", branch); - osCommandOperations.executeCommand(updateCommand, module.getProject()).get(); } } @@ -143,8 +140,8 @@ public class GitOperations { logger.log(project, "Found existing repository %s. Obtaining latest changes…", repositoryName); - return osCommandOperations.executeCommand("git checkout master && git fetch --tags && git pull origin master", - project); + return osCommandOperations.executeCommand( + "git checkout master && git reset --hard && git fetch --tags && git pull origin master", project); } else {