From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 11 Jun 2007 23:06:10 +0000 (-0400)
Subject: git-gui: Include 'war on whitespace' fixes from git.git
X-Git-Tag: v1.5.2.2~13^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=615b865358f32537bd4a7065a042de435e9413f3;p=git.git

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 25647c806..eee495a98 100755
--- 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 88b056522..72494c1a1 100644
--- 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"
 }
-