git-gui: Include 'war on whitespace' fixes from git.git

Earlier git.git applied a large "war on whitespace" patch that was
created using 'apply --whitespace=strip'.  Unfortunately a few of
git-gui's own files got caught in the mix and were also cleaned up.
That was a6080a0a44d5ead84db3dabbbc80e82df838533d.

This patch is needed in git-gui.git to reapply those exact same
changes here, otherwise our version generator script is unable to
obtain our version number from git-describe when we are hosted in
the git.git repository.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 25647c8060d8e30ef48d972e487dc9b280266b88..eee495a98666094415233a7023c03db9852dfe53 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -78,5 +78,3 @@ test "$VN" = "$VC" || {
        echo >&2 "GITGUI_VERSION = $VN"
        echo "GITGUI_VERSION = $VN" >$GVF
 }
-
-

diff --git a/lib/class.tcl b/lib/class.tcl
index 88b056522a866b3acc9620218ec8dfae042d62a2..72494c1a1ea51ec004a63f08f2c62db9096c2318 100644 (file)
--- a/lib/class.tcl
+++ b/lib/class.tcl
@@ -151,4 +151,3 @@ auto_mkindex_parser::command constructor {name args} {
                [format { [list source [file join $dir %s]]} \
                [file split $scriptFile]] "\n"
 }
-