Merge branch 'master' into bugfix/disable-blame-history-popup-for-untracked-files

kpbaks · web-flow · commit fcdba06a26fe · 2025-02-01T18:43:04.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+* After commit: jump back to unstaged area [[@tommady](https://github.com/tommady)] ([#2476](https://github.com/extrawurst/gitui/issues/2476))
+
 ## [0.27.0] - 2024-01-14
 
 **new: manage remotes**
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -58,7 +58,7 @@ syntect = { version = "5.2", default-features = false, features = [
     "html",
 ] }
 tui-textarea = "0.7"
-two-face = { version = "0.4.1", default-features = false }
+two-face = { version = "0.4.2", default-features = false }
 unicode-segmentation = "1.12"
 unicode-truncate = "2.0"
 unicode-width = "0.2"
diff --git a/src/popups/commit.rs b/src/popups/commit.rs
@@ -218,6 +218,7 @@ impl CommitPopup {
 
 			self.hide();
 			self.queue.push(InternalEvent::Update(NeedsUpdate::ALL));
+			self.queue.push(InternalEvent::StatusLastFileMoved);
 			self.input.clear();
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,7 @@ impl CommitPopup {`
`218`	`218`
`219`	`219`	`self.hide();`
`220`	`220`	`self.queue.push(InternalEvent::Update(NeedsUpdate::ALL));`
	`221`	`+ self.queue.push(InternalEvent::StatusLastFileMoved);`
`221`	`222`	`self.input.clear();`
`222`	`223`	`}`
`223`	`224`