[PATCH (GIT-GUI BUG)] git-gui: use of undeclared variable in handle_empty_diff

[PATCH (GIT-GUI BUG)] git-gui: use of undeclared variable in handle_empty_diff

[Joerg Bornemann]

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]

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. 

[-- Attachment #2: diff.txt --]
[-- Type: text/plain, Size: 442 bytes --]

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"

Re: [PATCH (GIT-GUI BUG)] git-gui: use of undeclared variable in handle_empty_diff

[Sverre Rabbelier]

Heya,

On Sun, Apr 5, 2009 at 22:20, Joerg Bornemann <git@jbornemann.de> wrote:
> Commit 584fa9cc ("git-gui: Avoid an infinite rescan loop in

Please submit your patch as documented by SubmittingPatches (e.g.,
include a "Signed off by" line, use the formatting as generated by
'git format-patch', inline the patch rather than attaching it, etc).
Thanks!

-- 
Cheers,

Sverre Rabbelier

Re: [PATCH (GIT-GUI BUG)] git-gui: use of undeclared variable in handle_empty_diff

[Johannes Schindelin]

Hi,

On Sun, 5 Apr 2009, Joerg Bornemann wrote:

> 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.

Under which circumstances does this bug trigger?  I never saw it happen.

Ciao,
Dscho