From c17717569146c9d87b4e77884adb545d21ebcf9f Mon Sep 17 00:00:00 2001 From: cuinixam <22344617+cuinixam@users.noreply.github.com> Date: Sat, 26 Apr 2025 15:03:00 +0200 Subject: [PATCH] feat: update rebase animation to reset HEAD (WIP) --- src/js/git/index.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/js/git/index.js b/src/js/git/index.js index b8aba3cb..1fbb475a 100644 --- a/src/js/git/index.js +++ b/src/js/git/index.js @@ -2420,6 +2420,17 @@ GitEngine.prototype.rebaseFinish = function( }); } + // Move HEAD to the commit we are rebasing onto + chain = chain.then(function() { + this.checkout(this.getCommitFromRef(targetSource)); + return this.animationFactory.playRefreshAnimation(this.gitVisuals); + }.bind(this)); + + // add a small delay for clarity before the next animation + chain = chain.then(function() { + return this.animationFactory.getDelayedPromise(400); + }.bind(this)); + chain = this.animationFactory.highlightEachWithPromise( chain, toRebase,