Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

git_ui: Fix amend not working for detached HEAD (#29017)

Browse source 
Closes #28736

Release Notes:

- Fixed git amend not working for detached HEAD.
This commit is contained in:
Smit Barmase 2025-04-18 06:15:54 +05:30 • committed by GitHub
parent f8d097acd6
commit 6e0732a9d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 39 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/git_ui/src/commit_modal.rs
View file

@ -128,9 +128,16 @@ impl CommitModal {
if let Some(force_mode) = force_mode {
match force_mode {
ForceMode::Amend => {
if !git_panel.amend_pending() {
git_panel.set_amend_pending(true, cx);
git_panel.load_last_commit_message_if_empty(cx);
if git_panel
.active_repository
.as_ref()
.and_then(|repo| repo.read(cx).head_commit.as_ref())
.is_some()
{
if !git_panel.amend_pending() {
git_panel.set_amend_pending(true, cx);
git_panel.load_last_commit_message_if_empty(cx);
}
}
}
ForceMode::Commit => {
@ -297,8 +304,7 @@ impl CommitModal {
let is_amend_pending = git_panel.amend_pending();
let has_previous_commit = active_repo
.as_ref()
.and_then(|repo| repo.read(cx).branch.as_ref())
.and_then(|branch| branch.most_recent_commit.as_ref())
.and_then(|repo| repo.read(cx).head_commit.as_ref())
.is_some();
(
can_commit,
@ -533,6 +539,16 @@ impl CommitModal {
}
fn amend(&mut self, _: &git::Amend, window: &mut Window, cx: &mut Context<Self>) {
if self
.git_panel
.read(cx)
.active_repository
.as_ref()
.and_then(|repo| repo.read(cx).head_commit.as_ref())
.is_some()
{
return;
}
if !self.git_panel.read(cx).amend_pending() {
self.git_panel.update(cx, |git_panel, cx| {
git_panel.set_amend_pending(true, cx);

34
crates/git_ui/src/git_panel.rs
View file

@ -1406,13 +1406,20 @@ impl GitPanel {
.focus_handle(cx)
.contains_focused(window, cx)
{
if !self.amend_pending {
self.set_amend_pending(true, cx);
self.load_last_commit_message_if_empty(cx);
} else {
telemetry::event!("Git Amended", source = "Git Panel");
self.set_amend_pending(false, cx);
self.commit_changes(CommitOptions { amend: true }, window, cx);
if self
.active_repository
.as_ref()
.and_then(|repo| repo.read(cx).head_commit.as_ref())
.is_some()
{
if !self.amend_pending {
self.set_amend_pending(true, cx);
self.load_last_commit_message_if_empty(cx);
} else {
telemetry::event!("Git Amended", source = "Git Panel");
self.set_amend_pending(false, cx);
self.commit_changes(CommitOptions { amend: true }, window, cx);
}
}
} else {
cx.propagate();
@ -1426,11 +1433,9 @@ impl GitPanel {
let Some(active_repository) = self.active_repository.as_ref() else {
return;
};
let Some(branch) = active_repository.read(cx).branch.as_ref() else {
return;
};
let Some(recent_sha) = branch
.most_recent_commit
let Some(recent_sha) = active_repository
.read(cx)
.head_commit
.as_ref()
.map(|commit| commit.sha.to_string())
else {
@ -2958,10 +2963,7 @@ impl GitPanel {
let editor_is_long = self.commit_editor.update(cx, |editor, cx| {
editor.max_point(cx).row().0 >= MAX_PANEL_EDITOR_LINES as u32
});
let has_previous_commit = branch
.as_ref()
.and_then(|branch| branch.most_recent_commit.as_ref())
.is_some();
let has_previous_commit = head_commit.is_some();
let footer = v_flex()
.child(PanelRepoFooter::new(