File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed
src/main/java/hudson/plugins/git Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff 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 "
You can’t perform that action at this time.
0 commit comments