Merge https://github.com/prati0100/git-gui

gitster · gitster · commit ae92ac8ae383 · 2020-05-21T11:15:04.000-07:00
* https://github.com/prati0100/git-gui: git-gui: Handle Ctrl + BS/Del in the commit msg Subject: git-gui: fix syntax error because of missing semicolon
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
@@ -2600,12 +2600,12 @@ proc toggle_or_diff {mode w args} {
 			update_indexinfo \
 				"Unstaging [short_path $path] from commit" \
 				[list $path] \
-				[concat $after [list ui_ready]]
+				[concat $after {ui_ready;}]
 		} elseif {$w eq $ui_workdir} {
 			update_index \
 				"Adding [short_path $path]" \
 				[list $path] \
-				[concat $after [list ui_ready]]
+				[concat $after {ui_ready;}]
 		}
 	} else {
 		set selected_paths($path) 1
@@ -3928,6 +3928,8 @@ bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
+bind $ui_comm <$M1B-Key-BackSpace> {event generate %W <Meta-Delete>;break}
+bind $ui_comm <$M1B-Key-Delete> {event generate %W <Meta-d>;break}
 
 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl
@@ -60,7 +60,7 @@ proc rescan_on_error {err {after {}}} {
 
 	$::main_status stop_all
 	unlock_index
-	rescan [concat $after [list ui_ready]] 0
+	rescan [concat $after {ui_ready;}] 0
 }
 
 proc update_indexinfo {msg path_list after} {
@@ -314,7 +314,7 @@ proc unstage_helper {txt paths} {
 		update_indexinfo \
 			$txt \
 			$path_list \
-			[concat $after [list ui_ready]]
+			[concat $after {ui_ready;}]
 	}
 }
 
@@ -366,7 +366,7 @@ proc add_helper {txt paths} {
 		update_index \
 			$txt \
 			$path_list \
-			[concat $after {ui_status [mc "Ready to commit."]}]
+			[concat $after {ui_status [mc "Ready to commit."];}]
 	}
 }
 
diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl
@@ -59,7 +59,7 @@ proc merge_add_resolution {path} {
 	update_index \
 		[mc "Adding resolution for %s" [short_path $path]] \
 		[list $path] \
-		[concat $after [list ui_ready]]
+		[concat $after {ui_ready;}]
 }
 
 proc merge_force_stage {stage} {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ proc rescan_on_error {err {after {}}} {`
`60`	`60`
`61`	`61`	`$::main_status stop_all`
`62`	`62`	`unlock_index`
`63`		`- rescan [concat $after [list ui_ready]] 0`
	`63`	`+ rescan [concat $after {ui_ready;}] 0`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`proc update_indexinfo {msg path_list after} {`
`@@ -314,7 +314,7 @@ proc unstage_helper {txt paths} {`
`314`	`314`	`update_indexinfo \`
`315`	`315`	`$txt \`
`316`	`316`	`$path_list \`
`317`		`- [concat $after [list ui_ready]]`
	`317`	`+ [concat $after {ui_ready;}]`
`318`	`318`	`}`
`319`	`319`	`}`
`320`	`320`
`@@ -366,7 +366,7 @@ proc add_helper {txt paths} {`
`366`	`366`	`update_index \`
`367`	`367`	`$txt \`
`368`	`368`	`$path_list \`
`369`		`- [concat $after {ui_status [mc "Ready to commit."]}]`
	`369`	`+ [concat $after {ui_status [mc "Ready to commit."];}]`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ proc merge_add_resolution {path} {`
`59`	`59`	`update_index \`
`60`	`60`	`[mc "Adding resolution for %s" [short_path $path]] \`
`61`	`61`	`[list $path] \`
`62`		`- [concat $after [list ui_ready]]`
	`62`	`+ [concat $after {ui_ready;}]`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`proc merge_force_stage {stage} {`