From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 8 May 2007 03:36:31 +0000 (-0400)
Subject: Merge branch 'master' of git://repo.or.cz/git-gui
X-Git-Tag: v1.5.2-rc3~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5f5dbd719d0d8ec136f32a0a56674902bd85f72f;p=git.git

Merge branch 'master' of git://repo.or.cz/git-gui

* 'master' of git://repo.or.cz/git-gui:
  git-gui: Use vi-like keys in merge dialog
  git-gui: Include commit id/subject in merge choices
  git-gui: Show all possible branches for merge
  git-gui: Move merge support into a namespace
  git-gui: Allow vi keys to scroll the diff/blame regions
  git-gui: Move console procs into their own namespace
  git-gui: Refactor into multiple files to save my sanity
  git-gui: Track our own embedded values and rebuild when they change
  git-gui: Refactor to use our git proc more often
  git-gui: Use option database defaults to set the font
  git-gui: Cleanup common font handling for font_ui
  git-gui: Correct line wrapping for too many branch message
  git-gui: Warn users before making an octopus merge
  git-gui: Include the subject in the status bar after commit

Also perform an evil merge change to update Git's main Makefile to
pass the proper options down into git-gui now that it depends on
reasonable values for 'sharedir' and 'TCL_PATH'.

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

5f5dbd719d0d8ec136f32a0a56674902bd85f72f
diff --cc Makefile
index e0a1308c0,ba1e33ba8..e89ccd496
--- a/Makefile
+++ b/Makefile
@@@ -3,745 -2,53 +3,753 @@@ all:
  
  # Define V=1 to have a more verbose compile.
  #
 +# Define NO_OPENSSL environment variable if you do not have OpenSSL.
 +# This also implies MOZILLA_SHA1.
 +#
 +# Define NO_CURL if you do not have curl installed.  git-http-pull and
 +# git-http-push are not built, and you cannot use http:// and https://
 +# transports.
 +#
 +# Define CURLDIR=/foo/bar if your curl header and library files are in
 +# /foo/bar/include and /foo/bar/lib directories.
 +#
 +# Define NO_EXPAT if you do not have expat installed.  git-http-push is
 +# not built, and you cannot push using http:// and https:// transports.
 +#
 +# Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent.
 +#
 +# Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks
 +# d_type in struct dirent (latest Cygwin -- will be fixed soonish).
 +#
 +# Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
 +# do not support the 'size specifiers' introduced by C99, namely ll, hh,
 +# j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
 +# some C compilers supported these specifiers prior to C99 as an extension.
 +#
 +# Define NO_STRCASESTR if you don't have strcasestr.
 +#
 +# Define NO_STRLCPY if you don't have strlcpy.
 +#
 +# Define NO_STRTOUMAX if you don't have strtoumax in the C library.
 +# If your compiler also does not support long long or does not have
 +# strtoull, define NO_STRTOULL.
 +#
 +# Define NO_SETENV if you don't have setenv in the C library.
 +#
 +# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
 +# Enable it on Windows.  By default, symrefs are still used.
 +#
 +# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability
 +# tests.  These tests take up a significant amount of the total test time
 +# but are not needed unless you plan to talk to SVN repos.
 +#
 +# Define NO_FINK if you are building on Darwin/Mac OS X, have Fink
 +# installed in /sw, but don't want GIT to link against any libraries
 +# installed there.  If defined you may specify your own (or Fink's)
 +# include directories and library directories by defining CFLAGS
 +# and LDFLAGS appropriately.
 +#
 +# Define NO_DARWIN_PORTS if you are building on Darwin/Mac OS X,
 +# have DarwinPorts installed in /opt/local, but don't want GIT to
 +# link against any libraries installed there.  If defined you may
 +# specify your own (or DarwinPort's) include directories and
 +# library directories by defining CFLAGS and LDFLAGS appropriately.
 +#
 +# Define PPC_SHA1 environment variable when running make to make use of
 +# a bundled SHA1 routine optimized for PowerPC.
 +#
 +# Define ARM_SHA1 environment variable when running make to make use of
 +# a bundled SHA1 routine optimized for ARM.
 +#
 +# Define MOZILLA_SHA1 environment variable when running make to make use of
 +# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast
 +# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
 +# choice) has very fast version optimized for i586.
 +#
 +# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
 +#
 +# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
 +#
 +# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
 +# Patrick Mauritz).
 +#
 +# Define NO_MMAP if you want to avoid mmap.
 +#
 +# Define NO_PREAD if you have a problem with pread() system call (e.g.
 +# cygwin.dll before v1.5.22).
 +#
 +# Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is
 +# generally faster on your platform than accessing the working directory.
 +#
 +# Define NO_TRUSTABLE_FILEMODE if your filesystem may claim to support
 +# the executable mode bit, but doesn't really do so.
 +#
 +# Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
 +#
 +# Define NO_SOCKADDR_STORAGE if your platform does not have struct
 +# sockaddr_storage.
 +#
 +# Define NO_ICONV if your libc does not properly support iconv.
 +#
 +# Define OLD_ICONV if your library has an old iconv(), where the second
 +# (input buffer pointer) parameter is declared with type (const char **).
 +#
 +# Define NO_R_TO_GCC if your gcc does not like "-R/path/lib" that
 +# tells runtime paths to dynamic libraries; "-Wl,-rpath=/path/lib"
 +# is used instead.
 +#
 +# Define USE_NSEC below if you want git to care about sub-second file mtimes
 +# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
 +# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
 +# randomly break unless your underlying filesystem supports those sub-second
 +# times (my ext3 doesn't).
 +#
 +# Define USE_STDEV below if you want git to care about the underlying device
 +# change being considered an inode change from the update-cache perspective.
 +#
 +# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
 +# MakeMaker (e.g. using ActiveState under Cygwin).
 +#
 +# Define WITH_P4IMPORT to build and install Python git-p4import script.
 +#
 +# Define NO_TCLTK if you do not want Tcl/Tk GUI.
 +#
- # The TCLTK_PATH variable governs the location of the Tck/Tk interpreter.
++# The TCL_PATH variable governs the location of the Tcl interpreter
++# used to optimize git-gui for your system.  Only used if NO_TCLTK
++# is not set.  Defaults to the bare 'tclsh'.
++#
++# The TCLTK_PATH variable governs the location of the Tcl/Tk interpreter.
 +# If not set it defaults to the bare 'wish'. If it is set to the empty
 +# string then NO_TCLTK will be forced (this is used by configure script).
 +#
  
  GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
  -include GIT-VERSION-FILE
  
 -SCRIPT_SH = git-gui.sh
 -GITGUI_BUILT_INS = git-citool
 -ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH))
 -ALL_LIBFILES = $(wildcard lib/*.tcl)
 +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 +uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
 +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
 +uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
 +uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
 +
 +# CFLAGS and LDFLAGS are for the users to override from the command line.
 +
 +CFLAGS = -g -O2 -Wall
 +LDFLAGS =
 +ALL_CFLAGS = $(CFLAGS)
 +ALL_LDFLAGS = $(LDFLAGS)
 +STRIP ?= strip
 +
 +prefix = $(HOME)
 +bindir = $(prefix)/bin
 +gitexecdir = $(bindir)
- template_dir = $(prefix)/share/git-core/templates/
++sharedir = $(prefix)/share/
++template_dir = $(sharedir)/git-core/templates/
 +ifeq ($(prefix),/usr)
 +sysconfdir = /etc
 +else
 +sysconfdir = $(prefix)/etc
 +endif
 +ETC_GITCONFIG = $(sysconfdir)/gitconfig
 +# DESTDIR=
 +
 +# default configuration for gitweb
 +GITWEB_CONFIG = gitweb_config.perl
 +GITWEB_HOME_LINK_STR = projects
 +GITWEB_SITENAME =
 +GITWEB_PROJECTROOT = /pub/git
 +GITWEB_EXPORT_OK =
 +GITWEB_STRICT_EXPORT =
 +GITWEB_BASE_URL =
 +GITWEB_LIST =
 +GITWEB_HOMETEXT = indextext.html
 +GITWEB_CSS = gitweb.css
 +GITWEB_LOGO = git-logo.png
 +GITWEB_FAVICON = git-favicon.png
 +GITWEB_SITE_HEADER =
 +GITWEB_SITE_FOOTER =
 +
- export prefix bindir gitexecdir template_dir sysconfdir
++export prefix bindir gitexecdir sharedir template_dir sysconfdir
 +
 +CC = gcc
 +AR = ar
 +TAR = tar
 +INSTALL = install
 +RPMBUILD = rpmbuild
++TCL_PATH = tclsh
 +TCLTK_PATH = wish
 +
++export TCL_PATH TCLTK_PATH
++
 +# sparse is architecture-neutral, which means that we need to tell it
 +# explicitly what architecture to check for. Fix this up for yours..
 +SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
 +
 +
 +
 +### --- END CONFIGURATION SECTION ---
 +
 +# Those must not be GNU-specific; they are shared with perl/ which may
 +# be built by a different compiler. (Note that this is an artifact now
 +# but it still might be nice to keep that distinction.)
 +BASIC_CFLAGS =
 +BASIC_LDFLAGS =
 +
 +SCRIPT_SH = \
 +	git-bisect.sh git-checkout.sh \
 +	git-clean.sh git-clone.sh git-commit.sh \
 +	git-fetch.sh \
 +	git-ls-remote.sh \
 +	git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \
 +	git-pull.sh git-rebase.sh \
 +	git-repack.sh git-request-pull.sh git-reset.sh \
 +	git-sh-setup.sh \
 +	git-tag.sh git-verify-tag.sh \
 +	git-applymbox.sh git-applypatch.sh git-am.sh \
 +	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
 +	git-merge-resolve.sh git-merge-ours.sh \
 +	git-lost-found.sh git-quiltimport.sh
 +
 +SCRIPT_PERL = \
 +	git-add--interactive.perl \
 +	git-archimport.perl git-cvsimport.perl git-relink.perl \
 +	git-cvsserver.perl git-remote.perl \
 +	git-svnimport.perl git-cvsexportcommit.perl \
 +	git-send-email.perl git-svn.perl
 +
 +SCRIPT_PYTHON = \
 +	git-p4import.py
 +
 +ifdef WITH_P4IMPORT
 +SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
 +	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
 +	  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
 +	  git-status git-instaweb
 +else
 +SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
 +	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
 +	  git-status git-instaweb
 +endif
 +
 +
 +# ... and all the rest that could be moved out of bindir to gitexecdir
 +PROGRAMS = \
 +	git-convert-objects$X git-fetch-pack$X git-fsck$X \
 +	git-hash-object$X git-index-pack$X git-local-fetch$X \
 +	git-fast-import$X \
 +	git-merge-base$X \
 +	git-daemon$X \
 +	git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
 +	git-peek-remote$X git-receive-pack$X \
 +	git-send-pack$X git-shell$X \
 +	git-show-index$X git-ssh-fetch$X \
 +	git-ssh-upload$X git-unpack-file$X \
 +	git-update-server-info$X \
 +	git-upload-pack$X git-verify-pack$X \
 +	git-pack-redundant$X git-var$X \
 +	git-merge-tree$X git-imap-send$X \
 +	git-merge-recursive$X \
 +	$(EXTRA_PROGRAMS)
 +
 +# Empty...
 +EXTRA_PROGRAMS =
 +
 +BUILT_INS = \
 +	git-format-patch$X git-show$X git-whatchanged$X git-cherry$X \
 +	git-get-tar-commit-id$X git-init$X git-repo-config$X \
 +	git-fsck-objects$X git-cherry-pick$X \
 +	$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
  
 +# what 'all' will build and 'install' will install, in gitexecdir
 +ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
 +
 +ALL_PROGRAMS += git-merge-subtree$X
 +
 +# what 'all' will build but not install in gitexecdir
 +OTHER_PROGRAMS = git$X gitweb/gitweb.cgi
 +ifndef NO_TCLTK
 +OTHER_PROGRAMS += gitk-wish
 +endif
 +
 +# Backward compatibility -- to be removed after 1.0
 +PROGRAMS += git-ssh-pull$X git-ssh-push$X
 +
 +# Set paths to tools early so that they can be used for version tests.
  ifndef SHELL_PATH
  	SHELL_PATH = /bin/sh
  endif
 +ifndef PERL_PATH
 +	PERL_PATH = /usr/bin/perl
 +endif
 +ifndef PYTHON_PATH
 +	PYTHON_PATH = /usr/local/bin/python
 +endif
 +
 +export PERL_PATH
 +
 +LIB_FILE=libgit.a
 +XDIFF_LIB=xdiff/lib.a
 +
 +LIB_H = \
 +	archive.h blob.h cache.h commit.h csum-file.h delta.h grep.h \
 +	diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \
 +	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
 +	tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \
 +	utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h mailmap.h
 +
 +DIFF_OBJS = \
 +	diff.o diff-lib.o diffcore-break.o diffcore-order.o \
 +	diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
 +	diffcore-delta.o log-tree.o
 +
 +LIB_OBJS = \
 +	blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
 +	date.o diff-delta.o entry.o exec_cmd.o ident.o \
 +	interpolate.o \
 +	lockfile.o \
 +	patch-ids.o \
 +	object.o pack-check.o pack-write.o patch-delta.o path.o pkt-line.o \
 +	sideband.o reachable.o reflog-walk.o \
 +	quote.o read-cache.o refs.o run-command.o dir.o object-refs.o \
 +	server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
 +	tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
 +	revision.o pager.o tree-walk.o xdiff-interface.o \
 +	write_or_die.o trace.o list-objects.o grep.o match-trees.o \
 +	alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
 +	color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \
 +	convert.o attr.o decorate.o progress.o mailmap.o
 +
 +BUILTIN_OBJS = \
 +	builtin-add.o \
 +	builtin-annotate.o \
 +	builtin-apply.o \
 +	builtin-archive.o \
 +	builtin-blame.o \
 +	builtin-branch.o \
 +	builtin-bundle.o \
 +	builtin-cat-file.o \
 +	builtin-check-attr.o \
 +	builtin-checkout-index.o \
 +	builtin-check-ref-format.o \
 +	builtin-commit-tree.o \
 +	builtin-count-objects.o \
 +	builtin-describe.o \
 +	builtin-diff.o \
 +	builtin-diff-files.o \
 +	builtin-diff-index.o \
 +	builtin-diff-tree.o \
 +	builtin-fetch--tool.o \
 +	builtin-fmt-merge-msg.o \
 +	builtin-for-each-ref.o \
 +	builtin-fsck.o \
 +	builtin-gc.o \
 +	builtin-grep.o \
 +	builtin-init-db.o \
 +	builtin-log.o \
 +	builtin-ls-files.o \
 +	builtin-ls-tree.o \
 +	builtin-mailinfo.o \
 +	builtin-mailsplit.o \
 +	builtin-merge-base.o \
 +	builtin-merge-file.o \
 +	builtin-mv.o \
 +	builtin-name-rev.o \
 +	builtin-pack-objects.o \
 +	builtin-prune.o \
 +	builtin-prune-packed.o \
 +	builtin-push.o \
 +	builtin-read-tree.o \
 +	builtin-reflog.o \
 +	builtin-config.o \
 +	builtin-rerere.o \
 +	builtin-rev-list.o \
 +	builtin-rev-parse.o \
 +	builtin-revert.o \
 +	builtin-rm.o \
 +	builtin-runstatus.o \
 +	builtin-shortlog.o \
 +	builtin-show-branch.o \
 +	builtin-stripspace.o \
 +	builtin-symbolic-ref.o \
 +	builtin-tar-tree.o \
 +	builtin-unpack-objects.o \
 +	builtin-update-index.o \
 +	builtin-update-ref.o \
 +	builtin-upload-archive.o \
 +	builtin-verify-pack.o \
 +	builtin-write-tree.o \
 +	builtin-show-ref.o \
 +	builtin-pack-refs.o
 +
 +GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 +EXTLIBS = -lz
 +
 +#
 +# Platform specific tweaks
 +#
 +
 +# We choose to avoid "if .. else if .. else .. endif endif"
 +# because maintaining the nesting to match is a pain.  If
 +# we had "elif" things would have been much nicer...
 +
 +ifeq ($(uname_S),Linux)
 +	NO_STRLCPY = YesPlease
 +endif
 +ifeq ($(uname_S),GNU/kFreeBSD)
 +	NO_STRLCPY = YesPlease
 +endif
 +ifeq ($(uname_S),Darwin)
 +	NEEDS_SSL_WITH_CRYPTO = YesPlease
 +	NEEDS_LIBICONV = YesPlease
 +	OLD_ICONV = UnfortunatelyYes
 +	NO_STRLCPY = YesPlease
 +endif
 +ifeq ($(uname_S),SunOS)
 +	NEEDS_SOCKET = YesPlease
 +	NEEDS_NSL = YesPlease
 +	SHELL_PATH = /bin/bash
 +	NO_STRCASESTR = YesPlease
 +	ifeq ($(uname_R),5.8)
 +		NEEDS_LIBICONV = YesPlease
 +		NO_UNSETENV = YesPlease
 +		NO_SETENV = YesPlease
 +		NO_C99_FORMAT = YesPlease
 +		NO_STRTOUMAX = YesPlease
 +	endif
 +	ifeq ($(uname_R),5.9)
 +		NO_UNSETENV = YesPlease
 +		NO_SETENV = YesPlease
 +		NO_C99_FORMAT = YesPlease
 +		NO_STRTOUMAX = YesPlease
 +	endif
 +	INSTALL = ginstall
 +	TAR = gtar
 +	BASIC_CFLAGS += -D__EXTENSIONS__
 +endif
 +ifeq ($(uname_O),Cygwin)
 +	NO_D_TYPE_IN_DIRENT = YesPlease
 +	NO_D_INO_IN_DIRENT = YesPlease
 +	NO_STRCASESTR = YesPlease
 +	NO_SYMLINK_HEAD = YesPlease
 +	NEEDS_LIBICONV = YesPlease
 +	NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
 +	NO_TRUSTABLE_FILEMODE = UnfortunatelyYes
 +	# There are conflicting reports about this.
 +	# On some boxes NO_MMAP is needed, and not so elsewhere.
 +	# Try commenting this out if you suspect MMAP is more efficient
 +	NO_MMAP = YesPlease
 +	NO_IPV6 = YesPlease
 +	X = .exe
 +endif
 +ifeq ($(uname_S),FreeBSD)
 +	NEEDS_LIBICONV = YesPlease
 +	BASIC_CFLAGS += -I/usr/local/include
 +	BASIC_LDFLAGS += -L/usr/local/lib
 +endif
 +ifeq ($(uname_S),OpenBSD)
 +	NO_STRCASESTR = YesPlease
 +	NEEDS_LIBICONV = YesPlease
 +	BASIC_CFLAGS += -I/usr/local/include
 +	BASIC_LDFLAGS += -L/usr/local/lib
 +endif
 +ifeq ($(uname_S),NetBSD)
 +	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
 +		NEEDS_LIBICONV = YesPlease
 +	endif
 +	BASIC_CFLAGS += -I/usr/pkg/include
 +	BASIC_LDFLAGS += -L/usr/pkg/lib
 +	ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
 +endif
 +ifeq ($(uname_S),AIX)
 +	NO_STRCASESTR=YesPlease
 +	NO_STRLCPY = YesPlease
 +	NEEDS_LIBICONV=YesPlease
 +endif
 +ifeq ($(uname_S),IRIX64)
 +	NO_IPV6=YesPlease
 +	NO_SETENV=YesPlease
 +	NO_STRCASESTR=YesPlease
 +	NO_STRLCPY = YesPlease
 +	NO_SOCKADDR_STORAGE=YesPlease
 +	SHELL_PATH=/usr/gnu/bin/bash
 +	BASIC_CFLAGS += -DPATH_MAX=1024
 +	# for now, build 32-bit version
 +	BASIC_LDFLAGS += -L/usr/lib32
 +endif
 +ifneq (,$(findstring arm,$(uname_M)))
 +	ARM_SHA1 = YesPlease
 +endif
 +
 +-include config.mak.autogen
 +-include config.mak
 +
 +ifeq ($(uname_S),Darwin)
 +	ifndef NO_FINK
 +		ifeq ($(shell test -d /sw/lib && echo y),y)
 +			BASIC_CFLAGS += -I/sw/include
 +			BASIC_LDFLAGS += -L/sw/lib
 +		endif
 +	endif
 +	ifndef NO_DARWIN_PORTS
 +		ifeq ($(shell test -d /opt/local/lib && echo y),y)
 +			BASIC_CFLAGS += -I/opt/local/include
 +			BASIC_LDFLAGS += -L/opt/local/lib
 +		endif
 +	endif
 +endif
 +
 +ifdef NO_R_TO_GCC_LINKER
 +	# Some gcc does not accept and pass -R to the linker to specify
 +	# the runtime dynamic library path.
 +	CC_LD_DYNPATH = -Wl,-rpath=
 +else
 +	CC_LD_DYNPATH = -R
 +endif
 +
 +ifndef NO_CURL
 +	ifdef CURLDIR
 +		# Try "-Wl,-rpath=$(CURLDIR)/lib" in such a case.
 +		BASIC_CFLAGS += -I$(CURLDIR)/include
 +		CURL_LIBCURL = -L$(CURLDIR)/lib $(CC_LD_DYNPATH)$(CURLDIR)/lib -lcurl
 +	else
 +		CURL_LIBCURL = -lcurl
 +	endif
 +	PROGRAMS += git-http-fetch$X
 +	curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
 +	ifeq "$(curl_check)" "070908"
 +		ifndef NO_EXPAT
 +			PROGRAMS += git-http-push$X
 +		endif
 +	endif
 +	ifndef NO_EXPAT
 +		EXPAT_LIBEXPAT = -lexpat
 +	endif
 +endif
 +
 +ifndef NO_OPENSSL
 +	OPENSSL_LIBSSL = -lssl
 +	ifdef OPENSSLDIR
 +		BASIC_CFLAGS += -I$(OPENSSLDIR)/include
 +		OPENSSL_LINK = -L$(OPENSSLDIR)/lib $(CC_LD_DYNPATH)$(OPENSSLDIR)/lib
 +	else
 +		OPENSSL_LINK =
 +	endif
 +else
 +	BASIC_CFLAGS += -DNO_OPENSSL
 +	MOZILLA_SHA1 = 1
 +	OPENSSL_LIBSSL =
 +endif
 +ifdef NEEDS_SSL_WITH_CRYPTO
 +	LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl
 +else
 +	LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
 +endif
 +ifdef NEEDS_LIBICONV
 +	ifdef ICONVDIR
 +		BASIC_CFLAGS += -I$(ICONVDIR)/include
 +		ICONV_LINK = -L$(ICONVDIR)/lib $(CC_LD_DYNPATH)$(ICONVDIR)/lib
 +	else
 +		ICONV_LINK =
 +	endif
 +	EXTLIBS += $(ICONV_LINK) -liconv
 +endif
 +ifdef NEEDS_SOCKET
 +	EXTLIBS += -lsocket
 +endif
 +ifdef NEEDS_NSL
 +	EXTLIBS += -lnsl
 +endif
 +ifdef NO_D_TYPE_IN_DIRENT
 +	BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT
 +endif
 +ifdef NO_D_INO_IN_DIRENT
 +	BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
 +endif
 +ifdef NO_C99_FORMAT
 +	BASIC_CFLAGS += -DNO_C99_FORMAT
 +endif
 +ifdef NO_SYMLINK_HEAD
 +	BASIC_CFLAGS += -DNO_SYMLINK_HEAD
 +endif
 +ifdef NO_STRCASESTR
 +	COMPAT_CFLAGS += -DNO_STRCASESTR
 +	COMPAT_OBJS += compat/strcasestr.o
 +endif
 +ifdef NO_STRLCPY
 +	COMPAT_CFLAGS += -DNO_STRLCPY
 +	COMPAT_OBJS += compat/strlcpy.o
 +endif
 +ifdef NO_STRTOUMAX
 +	COMPAT_CFLAGS += -DNO_STRTOUMAX
 +	COMPAT_OBJS += compat/strtoumax.o
 +endif
 +ifdef NO_STRTOULL
 +	COMPAT_CFLAGS += -DNO_STRTOULL
 +endif
 +ifdef NO_SETENV
 +	COMPAT_CFLAGS += -DNO_SETENV
 +	COMPAT_OBJS += compat/setenv.o
 +endif
 +ifdef NO_UNSETENV
 +	COMPAT_CFLAGS += -DNO_UNSETENV
 +	COMPAT_OBJS += compat/unsetenv.o
 +endif
 +ifdef NO_MMAP
 +	COMPAT_CFLAGS += -DNO_MMAP
 +	COMPAT_OBJS += compat/mmap.o
 +endif
 +ifdef NO_PREAD
 +	COMPAT_CFLAGS += -DNO_PREAD
 +	COMPAT_OBJS += compat/pread.o
 +endif
 +ifdef NO_FAST_WORKING_DIRECTORY
 +	BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY
 +endif
 +ifdef NO_TRUSTABLE_FILEMODE
 +	BASIC_CFLAGS += -DNO_TRUSTABLE_FILEMODE
 +endif
 +ifdef NO_IPV6
 +	BASIC_CFLAGS += -DNO_IPV6
 +endif
 +ifdef NO_SOCKADDR_STORAGE
 +ifdef NO_IPV6
 +	BASIC_CFLAGS += -Dsockaddr_storage=sockaddr_in
 +else
 +	BASIC_CFLAGS += -Dsockaddr_storage=sockaddr_in6
 +endif
 +endif
 +ifdef NO_INET_NTOP
 +	LIB_OBJS += compat/inet_ntop.o
 +endif
 +ifdef NO_INET_PTON
 +	LIB_OBJS += compat/inet_pton.o
 +endif
  
 -ifndef gitexecdir
 -	gitexecdir := $(shell git --exec-path)
 +ifdef NO_ICONV
 +	BASIC_CFLAGS += -DNO_ICONV
  endif
  
 -ifndef sharedir
 -	sharedir := $(dir $(gitexecdir))/share
 +ifdef OLD_ICONV
 +	BASIC_CFLAGS += -DOLD_ICONV
  endif
  
 -ifndef INSTALL
 -	INSTALL = install
 +ifdef PPC_SHA1
 +	SHA1_HEADER = "ppc/sha1.h"
 +	LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
 +else
 +ifdef ARM_SHA1
 +	SHA1_HEADER = "arm/sha1.h"
 +	LIB_OBJS += arm/sha1.o arm/sha1_arm.o
 +else
 +ifdef MOZILLA_SHA1
 +	SHA1_HEADER = "mozilla-sha1/sha1.h"
 +	LIB_OBJS += mozilla-sha1/sha1.o
 +else
 +	SHA1_HEADER = <openssl/sha.h>
 +	EXTLIBS += $(LIB_4_CRYPTO)
 +endif
 +endif
 +endif
 +ifdef NO_PERL_MAKEMAKER
 +	export NO_PERL_MAKEMAKER
  endif
  
 +ifeq ($(TCLTK_PATH),)
 +NO_TCLTK=NoThanks
 +endif
 +
 +QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
 +QUIET_SUBDIR1  =
 +
 +ifneq ($(findstring $(MAKEFLAGS),w),w)
 +PRINT_DIR = --no-print-directory
 +else # "make -w"
 +NO_SUBDIR = :
 +endif
 +
 +ifneq ($(findstring $(MAKEFLAGS),s),s)
  ifndef V
 -	QUIET_GEN      = @echo '   ' GEN $@;
 +	QUIET_CC       = @echo '   ' CC $@;
 +	QUIET_AR       = @echo '   ' AR $@;
 +	QUIET_LINK     = @echo '   ' LINK $@;
  	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
 -	QUIET_INDEX    = @echo '   ' INDEX $(dir $@);
 +	QUIET_GEN      = @echo '   ' GEN $@;
 +	QUIET_SUBDIR0  = +@subdir=
 +	QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
 +			 $(MAKE) $(PRINT_DIR) -C $$subdir
 +	export V
 +	export QUIET_GEN
 +	export QUIET_BUILT_IN
 +endif
  endif
  
 -TCL_PATH   ?= tclsh
 -TCLTK_PATH ?= wish
 +# Shell quote (do not use $(call) to accommodate ancient setups);
  
 -ifeq ($(findstring $(MAKEFLAGS),s),s)
 -QUIET_GEN =
 -QUIET_BUILT_IN =
 -endif
 +SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
 +ETC_GITCONFIG_SQ = $(subst ','\'',$(ETC_GITCONFIG))
  
  DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +bindir_SQ = $(subst ','\'',$(bindir))
  gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 +template_dir_SQ = $(subst ','\'',$(template_dir))
 +prefix_SQ = $(subst ','\'',$(prefix))
 +
  SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 +PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
 +PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
 -libdir   ?= $(sharedir)/git-gui/lib
 -libdir_SQ = $(subst ','\'',$(libdir))
 +LIBS = $(GITLIBS) $(EXTLIBS)
 +
 +BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
 +	-DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS)
 +LIB_OBJS += $(COMPAT_OBJS)
 +
 +ALL_CFLAGS += $(BASIC_CFLAGS)
 +ALL_LDFLAGS += $(BASIC_LDFLAGS)
 +
 +export prefix gitexecdir TAR INSTALL DESTDIR SHELL_PATH template_dir
 +
 +
 +### Build rules
 +
 +all:: $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS)
 +ifneq (,$X)
 +	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), rm -f '$p';)
 +endif
 +
 +all::
 +ifndef NO_TCLTK
- 	$(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) TCLTK_PATH='$(TCLTK_PATH_SQ)' all
++	$(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all
 +endif
 +	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
 +	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1)
 +
 +strip: $(PROGRAMS) git$X
 +	$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
 +
 +gitk-wish: gitk GIT-GUI-VARS
 +	$(QUIET_GEN)rm -f $@ $@+ && \
 +	sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
 +	chmod +x $@+ && \
 +	mv -f $@+ $@
 +
 +git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) GIT-CFLAGS
 +	$(QUIET_LINK)$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
 +		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
 +		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
 +
 +help.o: common-cmds.h
 +
 +git-merge-subtree$X: git-merge-recursive$X
 +	$(QUIET_BUILT_IN)rm -f $@ && ln git-merge-recursive$X $@
 +
 +$(BUILT_INS): git$X
 +	$(QUIET_BUILT_IN)rm -f $@ && ln git$X $@
 +
 +common-cmds.h: $(wildcard Documentation/git-*.txt)
 +	$(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@
  
  $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
  	$(QUIET_GEN)rm -f $@ $@+ && \
diff --cc git-gui/.gitignore
index c714d382e,000000000..020b86dea
mode 100644,000000..100644
--- a/git-gui/.gitignore
+++ b/git-gui/.gitignore
@@@ -1,3 -1,0 +1,5 @@@
 +GIT-VERSION-FILE
++GIT-GUI-VARS
 +git-citool
 +git-gui
++lib/tclIndex
diff --cc git-gui/Makefile
index b29d7d1e6,000000000..ba1e33ba8
mode 100644,000000..100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@@ -1,73 -1,0 +1,105 @@@
 +all::
 +
 +# Define V=1 to have a more verbose compile.
 +#
 +
 +GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 +	@$(SHELL_PATH) ./GIT-VERSION-GEN
 +-include GIT-VERSION-FILE
 +
 +SCRIPT_SH = git-gui.sh
 +GITGUI_BUILT_INS = git-citool
 +ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH))
++ALL_LIBFILES = $(wildcard lib/*.tcl)
 +
 +ifndef SHELL_PATH
 +	SHELL_PATH = /bin/sh
 +endif
 +
 +ifndef gitexecdir
 +	gitexecdir := $(shell git --exec-path)
 +endif
 +
++ifndef sharedir
++	sharedir := $(dir $(gitexecdir))/share
++endif
++
 +ifndef INSTALL
 +	INSTALL = install
 +endif
 +
 +ifndef V
 +	QUIET_GEN      = @echo '   ' GEN $@;
 +	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
++	QUIET_INDEX    = @echo '   ' INDEX $(dir $@);
 +endif
 +
++TCL_PATH   ?= tclsh
 +TCLTK_PATH ?= wish
 +
 +ifeq ($(findstring $(MAKEFLAGS),s),s)
 +QUIET_GEN =
 +QUIET_BUILT_IN =
 +endif
 +
 +DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 +SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 +TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 +
++libdir   ?= $(sharedir)/git-gui/lib
++libdir_SQ = $(subst ','\'',$(libdir))
++
 +$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
 +	$(QUIET_GEN)rm -f $@ $@+ && \
 +	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 +		-e 's|^exec wish "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \
 +		-e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
++		-e 's|@@GITGUI_LIBDIR@@|$(libdir_SQ)|' \
 +		$@.sh >$@+ && \
 +	chmod +x $@+ && \
 +	mv $@+ $@
 +
 +$(GITGUI_BUILT_INS): git-gui
 +	$(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@
 +
++lib/tclIndex: $(ALL_LIBFILES)
++	$(QUIET_INDEX)echo auto_mkindex lib '*.tcl' | $(TCL_PATH)
++
 +# These can record GITGUI_VERSION
- $(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE
++$(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE GIT-GUI-VARS
++
++TRACK_VARS = \
++	$(subst ','\'',SHELL_PATH='$(SHELL_PATH_SQ)') \
++	$(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \
++	$(subst ','\'',libdir='$(libdir_SQ)') \
++#end TRACK_VARS
++
++GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
++	@VARS='$(TRACK_VARS)'; \
++	if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
++		echo 1>&2 "    * new locations or Tcl/Tk interpreter"; \
++		echo 1>$@ "$$VARS"; \
++	fi
 +
- all:: $(ALL_PROGRAMS)
++all:: $(ALL_PROGRAMS) lib/tclIndex
 +
 +install: all
 +	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
++	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
++	$(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)'
++	$(foreach p,$(ALL_LIBFILES), $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;)
 +
 +dist-version:
 +	@mkdir -p $(TARDIR)
 +	@echo $(GITGUI_VERSION) > $(TARDIR)/version
 +
 +clean::
- 	rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE
++	rm -f $(ALL_PROGRAMS) lib/tclIndex
++	rm -f GIT-VERSION-FILE GIT-GUI-VARS
 +
 +.PHONY: all install dist-version clean
 +.PHONY: .FORCE-GIT-VERSION-FILE
++.PHONY: .FORCE-GIT-GUI-VARS
diff --cc git-gui/lib/blame.tcl
index 000000000,6d894e52d..6d894e52d
mode 000000,100644..100644
--- a/git-gui/lib/blame.tcl
+++ b/git-gui/lib/blame.tcl
diff --cc git-gui/lib/branch.tcl
index 000000000,caaee5cf1..caaee5cf1
mode 000000,100644..100644
--- a/git-gui/lib/branch.tcl
+++ b/git-gui/lib/branch.tcl
diff --cc git-gui/lib/browser.tcl
index 000000000,631859ae7..631859ae7
mode 000000,100644..100644
--- a/git-gui/lib/browser.tcl
+++ b/git-gui/lib/browser.tcl
diff --cc git-gui/lib/commit.tcl
index 000000000,f9791f64d..f9791f64d
mode 000000,100644..100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
diff --cc git-gui/lib/console.tcl
index 000000000,75f3e0463..75f3e0463
mode 000000,100644..100644
--- a/git-gui/lib/console.tcl
+++ b/git-gui/lib/console.tcl
diff --cc git-gui/lib/database.tcl
index 000000000,73058a826..73058a826
mode 000000,100644..100644
--- a/git-gui/lib/database.tcl
+++ b/git-gui/lib/database.tcl
diff --cc git-gui/lib/diff.tcl
index 000000000,7e715a686..7e715a686
mode 000000,100644..100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
diff --cc git-gui/lib/error.tcl
index 000000000,d0253ae2f..d0253ae2f
mode 000000,100644..100644
--- a/git-gui/lib/error.tcl
+++ b/git-gui/lib/error.tcl
diff --cc git-gui/lib/index.tcl
index 000000000,42742850e..42742850e
mode 000000,100644..100644
--- a/git-gui/lib/index.tcl
+++ b/git-gui/lib/index.tcl
diff --cc git-gui/lib/merge.tcl
index 000000000,3dce856e5..3dce856e5
mode 000000,100644..100644
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
diff --cc git-gui/lib/option.tcl
index 000000000,17fcc65f7..17fcc65f7
mode 000000,100644..100644
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
diff --cc git-gui/lib/remote.tcl
index 000000000,99f353ed7..99f353ed7
mode 000000,100644..100644
--- a/git-gui/lib/remote.tcl
+++ b/git-gui/lib/remote.tcl
diff --cc git-gui/lib/shortcut.tcl
index 000000000,ebf72e445..ebf72e445
mode 000000,100644..100644
--- a/git-gui/lib/shortcut.tcl
+++ b/git-gui/lib/shortcut.tcl
diff --cc git-gui/lib/transport.tcl
index 000000000,c0e7d20fc..c0e7d20fc
mode 000000,100644..100644
--- a/git-gui/lib/transport.tcl
+++ b/git-gui/lib/transport.tcl