Show total number of steps

tfpf · Nov 5, 2024 · 90c8be9 · 90c8be9
1 parent 1ecd124
commit 90c8be9
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/custom-prompt/custom-prompt.cc b/custom-prompt/custom-prompt.cc
@@ -327,12 +327,14 @@ void GitRepository::establish_state(void)
 void GitRepository::establish_state_rebasing(void){
     this->state = "rebasing";
     std::ifstream msgnum_file(this->gitdir / "rebase-merge/msgnum");
-    if(!msgnum_file.good()){
+    if(!msgnum_file.good()){return;}
+    std::ifstream end_file(this->gitdir / "rebase-merge/end");
+    if(!end_file.good()){return;}
+    std::string msgnum_contents, end_contents;
+    if(!(msgnum_file >> msgnum_contents) || !(end_file >> end_contents)){
         return;
     }
-    std::string msgnum_contents;
-    msgnum_file >> msgnum_contents;
-    this->state += " " + msgnum_contents;
+    this->state += ' ' + msgnum_contents + '/' + end_contents;
 }
 
 /**