From 10b25ee74b560c36d0af846c03e7533cd3002601 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Thu, 7 Nov 2024 10:49:21 +0100
Subject: [PATCH] Fix Git reset for Maven upgrade command.

---
 .../data/release/infra/InfrastructureCommands.java              | 2 ++
 .../data/release/infra/InfrastructureOperations.java            | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springframework/data/release/infra/InfrastructureCommands.java b/src/main/java/org/springframework/data/release/infra/InfrastructureCommands.java
index 8f7efcc..84b5f0b 100644
--- a/src/main/java/org/springframework/data/release/infra/InfrastructureCommands.java
+++ b/src/main/java/org/springframework/data/release/infra/InfrastructureCommands.java
@@ -93,6 +93,8 @@ public class InfrastructureCommands extends TimedCommand {
 
 		logger.log(iteration, "Applying Maven wrapper upgrades to Spring Data…");
 
+		git.prepare(iteration);
+
 		infra.upgradeMavenVersion(iteration);
 	}
 
diff --git a/src/main/java/org/springframework/data/release/infra/InfrastructureOperations.java b/src/main/java/org/springframework/data/release/infra/InfrastructureOperations.java
index 682ac0a..6da2262 100644
--- a/src/main/java/org/springframework/data/release/infra/InfrastructureOperations.java
+++ b/src/main/java/org/springframework/data/release/infra/InfrastructureOperations.java
@@ -135,8 +135,6 @@ public class InfrastructureOperations extends TimedCommand {
 			throw new IllegalStateException("No version to upgrade found!");
 		}
 
-		git.checkout(iteration.getTrain(), false);
-
 		List<Project> projectsToUpgrade = dependencies
 				.getProjectsToUpgradeMavenWrapper(dependencyVersions.get(Dependencies.MAVEN), iteration);