From c6f1bda740b4ed26b389aea10e3d36bc107a0a31 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Fri, 13 Oct 2023 11:40:07 +0200
Subject: [PATCH] Ensure force checkout to clean up any leftovers from a
 previous state.

Closes #62
---
 .../org/springframework/data/release/git/GitOperations.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 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 116ac70..6968fa7 100644
--- a/src/main/java/org/springframework/data/release/git/GitOperations.java
+++ b/src/main/java/org/springframework/data/release/git/GitOperations.java
@@ -216,7 +216,7 @@ public class GitOperations {
 			doWithGit(project, git -> {
 
 				logger.log(module, "git checkout %s", tag);
-				git.checkout().setName(tag.toString()).call();
+				git.checkout().setName(tag.toString()).setForced(true).call();
 			});
 		});
 
@@ -788,7 +788,7 @@ public class GitOperations {
 		doWithGit(project, git -> {
 
 			Optional<Ref> ref = Optional.ofNullable(git.getRepository().findRef(branch.toString()));
-			CheckoutCommand checkout = git.checkout().setName(branch.toString());
+			CheckoutCommand checkout = git.checkout().setName(branch.toString()).setForced(true);
 
 			if (ref.isPresent()) {