Commit 584fa9cc ("git-gui: Avoid an infinite rescan loop in handle_empty_diff.") introduced the global variable diff_empty_count, which is used in diff.tcl. But this variable isn't declared anywhere which results in an ugly error message box instead of the intended informative message. This patch fixes this and removes the unnecessary second initialization of current_diff_path.
diff --git a/git-gui.sh b/git-gui.sh index b3aa732..b0d5028 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1104,10 +1104,10 @@ set commit_type {} set empty_tree {} set current_branch {} set is_detached 0 -set current_diff_path {} set is_3way_diff 0 set is_conflict_diff 0 set selected_commit_type new +set diff_empty_count 0 set nullid "0000000000000000000000000000000000000000" set nullid2 "0000000000000000000000000000000000000001"