From 702eb8868f58e4640b5bf8ceaa0771e10a688608 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 21 Jan 2016 19:37:04 +0300
Subject: [PATCH] git: rebase: refresh the repo state info ASAP

it used to wait for the full refresh to complete, which can be slow.
in particular it led to such unfortunate effects: clicking abort
in the error notification could say "no rebase in progress" because the
VFS refresh didn't force .git/ files to refresh yet.
---
 plugins/git4idea/src/git4idea/rebase/GitRebaseProcess.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseProcess.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseProcess.java
index 3477e0fa5313..b3d90aa48330 100644
--- a/plugins/git4idea/src/git4idea/rebase/GitRebaseProcess.java
+++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseProcess.java
@@ -139,6 +139,7 @@ public class GitRebaseProcess {
         }
 
         GitRebaseStatus rebaseStatus = rebaseSingleRoot(repository, customMode, getSuccessfulRepositories(statuses));
+        repository.update(); // make the repo state info actual ASAP
         statuses.put(repository, rebaseStatus);
         if (shouldBeRefreshed(rebaseStatus)) {
           toRefresh.add(repository);