diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2007-06-11 19:06:10 -0400 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2007-06-11 19:06:10 -0400 |
commit | 615b865358f32537bd4a7065a042de435e9413f3 (patch) | |
tree | 6a9bf7888b3e2323745adb59eca3d33bb4f2defe | |
parent | d80ded01de0189fe7179913d3ecdeecadf2052a0 (diff) | |
download | git-615b865358f32537bd4a7065a042de435e9413f3.tar.gz |
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>
-rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
-rw-r--r-- | lib/class.tcl | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 25647c8060..eee495a986 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 88b056522a..72494c1a1e 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" } - |