Skip to content

Commit 2975766

Browse files
feat: skip rebase if not required
1 parent 1779a9d commit 2975766

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/main/java/hudson/plugins/git/GitPublisher.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,11 @@ else if (!tagExists) {
306306
if (b.isRebaseBeforePush()) {
307307
listener.getLogger().println("Fetch and rebase with " + branchName + " of " + targetRepo);
308308
git.fetch_().from(remoteURI, remote.getFetchRefSpecs()).execute();
309-
git.rebase().setUpstream(targetRepo + "/" + branchName).execute();
309+
if (!git.revParse("HEAD").equals(git.revParse(targetRepo + "/" + branchName))) {
310+
git.rebase().setUpstream(targetRepo + "/" + branchName).execute();
311+
} else {
312+
listener.getLogger().println("No rebase required. HEAD equals " + targetRepo + "/" + branchName);
313+
}
310314
}
311315

312316
listener.getLogger().println("Pushing HEAD to branch " + branchName + " at repo "

0 commit comments

Comments
 (0)