From 04156e9e3c0905bc13065a5c1466714c81e7ed12 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 23 Oct 2017 21:51:44 +0200 Subject: [PATCH] Added log statements after commiting --- .../cloud/release/internal/git/GitRepo.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java index a9ccd85b..e3098c90 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java @@ -135,6 +135,7 @@ class GitRepo { try(Git git = this.gitFactory.open(file(project))) { git.add().addFilepattern(".").call(); git.commit().setAllowEmpty(false).setMessage(message).call(); + printLog(git); } catch (EmtpyCommitException e) { log.info("There were no changes detected. Will not commit an empty commit"); } catch (Exception e) { @@ -142,6 +143,16 @@ class GitRepo { } } + private void printLog(Git git) throws GitAPIException, IOException { + int maxCount = 5; + String currentBranch = git.getRepository().getBranch(); + log.info("Printing [{}] last commits for branch [{}]", maxCount, currentBranch); + Iterable commits = git.log().setMaxCount(maxCount).call(); + for (RevCommit commit : commits) { + log.info("Name [{}], msg [{}]", commit.getId().name(), commit.getShortMessage()); + } + } + /** * Creates a tag with a given name * @param project @@ -210,6 +221,7 @@ class GitRepo { log.debug("The commit to be reverted is [{}]", commit); git.revert().include(commit).call(); git.commit().setAmend(true).setMessage(message).call(); + printLog(git); } catch (Exception e) { throw new IllegalStateException(e); }