When the user focuses the Commit Message widget (to write a message), the diff view may be blank. With this patch a staged file is automatically selected when the Commit Message widget is focused, if no other file is selected (i.e. diff view is blank). Signed-off-by: Birger Skogeng Pedersen <birger.sp@xxxxxxxxx> --- git-gui.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/git-gui.sh b/git-gui.sh index b7f4d1e..70b846a 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2700,6 +2700,15 @@ proc toggle_commit_type {} { do_select_commit_type } +proc check_diff_selected {} { + global current_diff_path file_lists + # If no diff path selected, select a staged file + if {$current_diff_path eq {} + && [llength $file_lists($::ui_index)] > 0} { + select_path_in_widget $::ui_index + } +} + ###################################################################### ## ## ui construction @@ -3437,6 +3446,8 @@ pack .vpane.lower.commarea.buffer.header -side top -fill x pack .vpane.lower.commarea.buffer.frame -side left -fill y pack .vpane.lower.commarea.buffer -side left -fill y +bind $ui_comm <FocusIn> {check_diff_selected} + # -- Commit Message Buffer Context Menu # set ctxm .vpane.lower.commarea.buffer.ctxm -- 2.23.0.windows.1