Merge branch 'maint'

* maint:
git-gui: Paper bag fix info dialog when no files are staged at commit

diff --git a/lib/error.tcl b/lib/error.tcl
index 08a24622c7ff199399805ef34f0396f6cb81613c..8c27678e3a45c011cfc6a21f5d53b0d87c66b4a6 100644 (file)
--- a/lib/error.tcl
+++ b/lib/error.tcl
@@ -47,7 +47,7 @@ proc info_popup {msg} {
                append title " ([reponame])"
        }
        tk_messageBox \
-               -parent $parent \
+               -parent [_error_parent] \
                -icon info \
                -type ok \
                -title $title \