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

spearce · spearce · commit 615b865358f3 · 2007-06-11T19:06:10.000-04:00
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 a6080a0. 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
@@ -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
@@ -151,4 +151,3 @@ auto_mkindex_parser::command constructor {name args} {
 		[format { [list source [file join $dir %s]]} \
 		[file split $scriptFile]] "\n"
 }
-

Original file line number	Diff line number	Diff line change
`@@ -78,5 +78,3 @@ test "$VN" = "$VC" \|\| {`
`78`	`78`	`echo >&2 "GITGUI_VERSION = $VN"`
`79`	`79`	`echo "GITGUI_VERSION = $VN" >$GVF`
`80`	`80`	`}`
`81`		`-`
`82`		`-`
Original file line number	Diff line number	Diff line change
`@@ -151,4 +151,3 @@ auto_mkindex_parser::command constructor {name args} {`
`151`	`151`	`[format { [list source [file join $dir %s]]} \`
`152`	`152`	`[file split $scriptFile]] "\n"`
`153`	`153`	`}`
`154`		`-`