[PATCH] git-gui: fix use of undeclared variable diff_empty_count

Subsystems: the rest

DORMANTno replies

2 messages, 1 author, 2016-06-15 · open the first message on its own page

[PATCH] git-gui: fix use of undeclared variable diff_empty_count

From: Joerg Bornemann <hidden>
Date: 2016-06-15 22:46:34

Commit 584fa9cc introduced the global variable diff_empty_count, which
is used in diff.tcl. This variable wasn't declared anywhere which
resulted in an ugly error message box instead of the intended
informative message.

Signed-off-by: Joerg Bornemann <redacted>
---
  git-gui.sh |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git-gui.sh b/git-gui.sh
index e4a9230..46b056f 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1131,6 +1131,7 @@ 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"
--
1.6.0.2.1172.ga5ed0

Re: [PATCH] git-gui: fix use of undeclared variable diff_empty_count

From: Joerg Bornemann <hidden>
Date: 2016-06-15 22:46:34

This bug occurs with msysgit under mysterious circumstances. We have at
least two Windows machines where "git diff" works correctly but "git 
gui" is unable to get the actual diffs. Before commit 584fa9cc, git gui 
favoured the user with an infinite message box loop. This is what 
584fa9cc should've fixed: display a nice message to the user. Instead I 
see the Tcl error message box, complaining about the missing variable 
diff_empty_count.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help