1 files changed, 178 insertions, 859 deletions

diff --git a/Documentation/perf_counter/Makefile b/Documentation/perf_counter/Makefile
index 6e0838b03ad1..11809b943fc3 100644
--- a/Documentation/perf_counter/Makefile
+++ b/Documentation/perf_counter/Makefile
@@ -13,16 +13,9 @@ all::
 # Define NO_OPENSSL environment variable if you do not have OpenSSL.
 # This also implies MOZILLA_SHA1.
 #
-# Define NO_CURL if you do not have libcurl 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 EXPATDIR=/foo/bar if your expat header and library files are in
 # /foo/bar/include and /foo/bar/lib directories.
 #
@@ -40,8 +33,6 @@ all::
 #
 # Define NO_MEMMEM if you don't have memmem.
 #
-# 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.
@@ -54,7 +45,7 @@ all::
 #
 # Define NO_SYS_SELECT_H if you don't have sys/select.h.
 #
-# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
+# Define NO_SYMLINK_HEAD if you never want .perf/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
@@ -62,13 +53,13 @@ all::
 # 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 in /sw, but don't want PERF 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
+# have DarwinPorts installed in /opt/local, but don't want PERF 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.
@@ -120,7 +111,7 @@ all::
 # 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
+# Define USE_NSEC below if you want perf 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
@@ -132,7 +123,7 @@ all::
 # Define NO_NSEC if your "struct stat" does not have "st_ctim.tv_nsec"
 # available.  This automatically turns USE_NSEC off.
 #
-# Define USE_STDEV below if you want git to care about the underlying device
+# Define USE_STDEV below if you want perf to care about the underlying device
 # change being considered an inode change from the update-index perspective.
 #
 # Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
@@ -150,27 +141,24 @@ all::
 # Define NO_TCLTK if you do not want Tcl/Tk GUI.
 #
 # The TCL_PATH variable governs the location of the Tcl interpreter
-# used to optimize git-gui for your system.  Only used if NO_TCLTK
+# used to optimize perf-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).
 #
-# Define THREADED_DELTA_SEARCH if you have pthreads and wish to exploit
-# parallel delta searching when packing objects.
-#
 # Define INTERNAL_QSORT to use Git's implementation of qsort(), which
 # is a simplified version of the merge sort used in glibc. This is
 # recommended if Git triggers O(n^2) behavior in your platform's qsort().
 #
-# Define NO_EXTERNAL_GREP if you don't want "git grep" to ever call
+# Define NO_EXTERNAL_GREP if you don't want "perf grep" to ever call
 # your external grep (e.g., if your system lacks grep, if its grep is
-# broken, or spawning external process is slower than built-in grep git has).
+# broken, or spawning external process is slower than built-in grep perf has).
 
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
-        @$(SHELL_PATH) ./GIT-VERSION-GEN
--include GIT-VERSION-FILE
+PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE
+        @$(SHELL_PATH) ./PERF-VERSION-GEN
+-include PERF-VERSION-FILE
 
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
@@ -182,20 +170,20 @@ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
 # CFLAGS and LDFLAGS are for the users to override from the command line.
 
 CFLAGS = -g -O2 -Wall
-LDFLAGS =
+LDFLAGS = -lpthread -lrt
 ALL_CFLAGS = $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
 STRIP ?= strip
 
 # Among the variables below, these:
-#   gitexecdir
+#   perfexecdir
 #   template_dir
 #   mandir
 #   infodir
 #   htmldir
-#   ETC_GITCONFIG (but not sysconfdir)
+#   ETC_PERFCONFIG (but not sysconfdir)
 # can be specified as a relative path some/where/else;
-# this is interpreted as relative to $(prefix) and "git" at
+# this is interpreted as relative to $(prefix) and "perf" at
 # runtime figures out where they are based on the path to the executable.
 # This can help installing the suite in a relocatable way.
 
@@ -204,38 +192,20 @@ bindir_relative = bin
 bindir = $(prefix)/$(bindir_relative)
 mandir = share/man
 infodir = share/info
-gitexecdir = libexec/git-core
+perfexecdir = libexec/perf-core
 sharedir = $(prefix)/share
-template_dir = share/git-core/templates
-htmldir = share/doc/git-doc
+template_dir = share/perf-core/templates
+htmldir = share/doc/perf-doc
 ifeq ($(prefix),/usr)
 sysconfdir = /etc
-ETC_GITCONFIG = $(sysconfdir)/gitconfig
+ETC_PERFCONFIG = $(sysconfdir)/perfconfig
 else
 sysconfdir = $(prefix)/etc
-ETC_GITCONFIG = etc/gitconfig
+ETC_PERFCONFIG = etc/perfconfig
 endif
 lib = lib
 # DESTDIR=
 
-# default configuration for gitweb
-GITWEB_CONFIG = gitweb_config.perl
-GITWEB_CONFIG_SYSTEM = /etc/gitweb.conf
-GITWEB_HOME_LINK_STR = projects
-GITWEB_SITENAME =
-GITWEB_PROJECTROOT = /pub/git
-GITWEB_PROJECT_MAXDEPTH = 2007
-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 sharedir sysconfdir
 
 CC = gcc
@@ -277,89 +247,46 @@ SCRIPT_PERL =
 SCRIPT_SH =
 TEST_PROGRAMS =
 
-SCRIPT_SH += git-am.sh
-SCRIPT_SH += git-bisect.sh
-SCRIPT_SH += git-difftool--helper.sh
-SCRIPT_SH += git-filter-branch.sh
-SCRIPT_SH += git-lost-found.sh
-SCRIPT_SH += git-merge-octopus.sh
-SCRIPT_SH += git-merge-one-file.sh
-SCRIPT_SH += git-merge-resolve.sh
-SCRIPT_SH += git-mergetool.sh
-SCRIPT_SH += git-mergetool--lib.sh
-SCRIPT_SH += git-parse-remote.sh
-SCRIPT_SH += git-pull.sh
-SCRIPT_SH += git-quiltimport.sh
-SCRIPT_SH += git-rebase--interactive.sh
-SCRIPT_SH += git-rebase.sh
-SCRIPT_SH += git-repack.sh
-SCRIPT_SH += git-request-pull.sh
-SCRIPT_SH += git-sh-setup.sh
-SCRIPT_SH += git-stash.sh
-SCRIPT_SH += git-submodule.sh
-SCRIPT_SH += git-web--browse.sh
-
-SCRIPT_PERL += git-add--interactive.perl
-SCRIPT_PERL += git-difftool.perl
-SCRIPT_PERL += git-archimport.perl
-SCRIPT_PERL += git-cvsexportcommit.perl
-SCRIPT_PERL += git-cvsimport.perl
-SCRIPT_PERL += git-cvsserver.perl
-SCRIPT_PERL += git-relink.perl
-SCRIPT_PERL += git-send-email.perl
-SCRIPT_PERL += git-svn.perl
+#
+# No scripts right now:
+#
+
+# SCRIPT_SH += perf-am.sh
+
+#
+# No Perl scripts right now:
+#
+
+# SCRIPT_PERL += perf-add--interactive.perl
 
 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
-          $(patsubst %.perl,%,$(SCRIPT_PERL)) \
-          git-instaweb
+          $(patsubst %.perl,%,$(SCRIPT_PERL))
 
 # Empty...
 EXTRA_PROGRAMS =
 
-# ... and all the rest that could be moved out of bindir to gitexecdir
+# ... and all the rest that could be moved out of bindir to perfexecdir
 PROGRAMS += $(EXTRA_PROGRAMS)
-PROGRAMS += git-fast-import$X
-PROGRAMS += git-hash-object$X
-PROGRAMS += git-index-pack$X
-PROGRAMS += git-merge-index$X
-PROGRAMS += git-merge-tree$X
-PROGRAMS += git-mktag$X
-PROGRAMS += git-mktree$X
-PROGRAMS += git-pack-redundant$X
-PROGRAMS += git-patch-id$X
-PROGRAMS += git-shell$X
-PROGRAMS += git-show-index$X
-PROGRAMS += git-unpack-file$X
-PROGRAMS += git-update-server-info$X
-PROGRAMS += git-upload-pack$X
-PROGRAMS += git-var$X
+
+#
+# None right now:
+#
+# PROGRAMS += perf-fast-import$X
 
 # List built-in command $C whose implementation cmd_$C() is not in
 # builtin-$C.o but is linked in as part of some other command.
-BUILT_INS += $(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
-
-BUILT_INS += git-cherry$X
-BUILT_INS += git-cherry-pick$X
-BUILT_INS += git-format-patch$X
-BUILT_INS += git-fsck-objects$X
-BUILT_INS += git-get-tar-commit-id$X
-BUILT_INS += git-init$X
-BUILT_INS += git-merge-subtree$X
-BUILT_INS += git-peek-remote$X
-BUILT_INS += git-repo-config$X
-BUILT_INS += git-show$X
-BUILT_INS += git-stage$X
-BUILT_INS += git-status$X
-BUILT_INS += git-whatchanged$X
-
-# what 'all' will build and 'install' will install, in gitexecdir
+BUILT_INS += $(patsubst builtin-%.o,perf-%$X,$(BUILTIN_OBJS))
+
+#
+# None right now:
+#
+# BUILT_INS += perf-init $X
+
+# what 'all' will build and 'install' will install, in perfexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
 
-# what 'all' will build but not install in gitexecdir
-OTHER_PROGRAMS = git$X
-ifndef NO_PERL
-OTHER_PROGRAMS += gitweb/gitweb.cgi
-endif
+# what 'all' will build but not install in perfexecdir
+OTHER_PROGRAMS = perf$X
 
 # Set paths to tools early so that they can be used for version tests.
 ifndef SHELL_PATH
@@ -371,250 +298,34 @@ endif
 
 export PERL_PATH
 
-LIB_FILE=libgit.a
-XDIFF_LIB=xdiff/lib.a
-
-LIB_H += archive.h
-LIB_H += attr.h
-LIB_H += blob.h
-LIB_H += builtin.h
-LIB_H += cache.h
-LIB_H += cache-tree.h
-LIB_H += commit.h
-LIB_H += compat/cygwin.h
-LIB_H += compat/mingw.h
-LIB_H += csum-file.h
-LIB_H += decorate.h
-LIB_H += delta.h
-LIB_H += diffcore.h
-LIB_H += diff.h
-LIB_H += dir.h
-LIB_H += fsck.h
-LIB_H += git-compat-util.h
-LIB_H += graph.h
-LIB_H += grep.h
-LIB_H += hash.h
-LIB_H += help.h
+LIB_FILE=libperf.a
+
+LIB_H += ../../include/linux/perf_counter.h
 LIB_H += levenshtein.h
-LIB_H += list-objects.h
-LIB_H += ll-merge.h
-LIB_H += log-tree.h
-LIB_H += mailmap.h
-LIB_H += merge-recursive.h
-LIB_H += object.h
-LIB_H += pack.h
-LIB_H += pack-refs.h
-LIB_H += pack-revindex.h
 LIB_H += parse-options.h
-LIB_H += patch-ids.h
-LIB_H += pkt-line.h
-LIB_H += progress.h
 LIB_H += quote.h
-LIB_H += reflog-walk.h
-LIB_H += refs.h
-LIB_H += remote.h
-LIB_H += rerere.h
-LIB_H += revision.h
-LIB_H += run-command.h
-LIB_H += sha1-lookup.h
-LIB_H += sideband.h
-LIB_H += sigchain.h
 LIB_H += strbuf.h
-LIB_H += string-list.h
-LIB_H += tag.h
-LIB_H += transport.h
-LIB_H += tree.h
-LIB_H += tree-walk.h
-LIB_H += unpack-trees.h
-LIB_H += userdiff.h
-LIB_H += utf8.h
-LIB_H += wt-status.h
+LIB_H += run-command.h
 
 LIB_OBJS += abspath.o
 LIB_OBJS += alias.o
-LIB_OBJS += alloc.o
-LIB_OBJS += archive.o
-LIB_OBJS += archive-tar.o
-LIB_OBJS += archive-zip.o
-LIB_OBJS += attr.o
-LIB_OBJS += base85.o
-LIB_OBJS += bisect.o
-LIB_OBJS += blob.o
-LIB_OBJS += branch.o
-LIB_OBJS += bundle.o
-LIB_OBJS += cache-tree.o
-LIB_OBJS += color.o
-LIB_OBJS += combine-diff.o
-LIB_OBJS += commit.o
 LIB_OBJS += config.o
-LIB_OBJS += connect.o
-LIB_OBJS += convert.o
-LIB_OBJS += copy.o
-LIB_OBJS += csum-file.o
 LIB_OBJS += ctype.o
-LIB_OBJS += date.o
-LIB_OBJS += decorate.o
-LIB_OBJS += diffcore-break.o
-LIB_OBJS += diffcore-delta.o
-LIB_OBJS += diffcore-order.o
-LIB_OBJS += diffcore-pickaxe.o
-LIB_OBJS += diffcore-rename.o
-LIB_OBJS += diff-delta.o
-LIB_OBJS += diff-lib.o
-LIB_OBJS += diff-no-index.o
-LIB_OBJS += diff.o
-LIB_OBJS += dir.o
-LIB_OBJS += editor.o
-LIB_OBJS += entry.o
-LIB_OBJS += environment.o
 LIB_OBJS += exec_cmd.o
-LIB_OBJS += fsck.o
-LIB_OBJS += graph.o
-LIB_OBJS += grep.o
-LIB_OBJS += hash.o
 LIB_OBJS += help.o
-LIB_OBJS += ident.o
 LIB_OBJS += levenshtein.o
-LIB_OBJS += list-objects.o
-LIB_OBJS += ll-merge.o
-LIB_OBJS += lockfile.o
-LIB_OBJS += log-tree.o
-LIB_OBJS += mailmap.o
-LIB_OBJS += match-trees.o
-LIB_OBJS += merge-file.o
-LIB_OBJS += merge-recursive.o
-LIB_OBJS += name-hash.o
-LIB_OBJS += object.o
-LIB_OBJS += pack-check.o
-LIB_OBJS += pack-refs.o
-LIB_OBJS += pack-revindex.o
-LIB_OBJS += pack-write.o
-LIB_OBJS += pager.o
 LIB_OBJS += parse-options.o
-LIB_OBJS += patch-delta.o
-LIB_OBJS += patch-ids.o
 LIB_OBJS += path.o
-LIB_OBJS += pkt-line.o
-LIB_OBJS += preload-index.o
-LIB_OBJS += pretty.o
-LIB_OBJS += progress.o
-LIB_OBJS += quote.o
-LIB_OBJS += reachable.o
-LIB_OBJS += read-cache.o
-LIB_OBJS += reflog-walk.o
-LIB_OBJS += refs.o
-LIB_OBJS += remote.o
-LIB_OBJS += rerere.o
-LIB_OBJS += revision.o
 LIB_OBJS += run-command.o
-LIB_OBJS += server-info.o
-LIB_OBJS += setup.o
-LIB_OBJS += sha1-lookup.o
-LIB_OBJS += sha1_file.o
-LIB_OBJS += sha1_name.o
-LIB_OBJS += shallow.o
-LIB_OBJS += sideband.o
-LIB_OBJS += sigchain.o
+LIB_OBJS += quote.o
 LIB_OBJS += strbuf.o
-LIB_OBJS += string-list.o
-LIB_OBJS += symlinks.o
-LIB_OBJS += tag.o
-LIB_OBJS += trace.o
-LIB_OBJS += transport.o
-LIB_OBJS += tree-diff.o
-LIB_OBJS += tree.o
-LIB_OBJS += tree-walk.o
-LIB_OBJS += unpack-trees.o
 LIB_OBJS += usage.o
-LIB_OBJS += userdiff.o
-LIB_OBJS += utf8.o
-LIB_OBJS += walker.o
 LIB_OBJS += wrapper.o
-LIB_OBJS += write_or_die.o
-LIB_OBJS += ws.o
-LIB_OBJS += wt-status.o
-LIB_OBJS += xdiff-interface.o
-
-BUILTIN_OBJS += builtin-add.o
-BUILTIN_OBJS += builtin-annotate.o
-BUILTIN_OBJS += builtin-apply.o
-BUILTIN_OBJS += builtin-archive.o
-BUILTIN_OBJS += builtin-bisect--helper.o
-BUILTIN_OBJS += builtin-blame.o
-BUILTIN_OBJS += builtin-branch.o
-BUILTIN_OBJS += builtin-bundle.o
-BUILTIN_OBJS += builtin-cat-file.o
-BUILTIN_OBJS += builtin-check-attr.o
-BUILTIN_OBJS += builtin-check-ref-format.o
-BUILTIN_OBJS += builtin-checkout-index.o
-BUILTIN_OBJS += builtin-checkout.o
-BUILTIN_OBJS += builtin-clean.o
-BUILTIN_OBJS += builtin-clone.o
-BUILTIN_OBJS += builtin-commit-tree.o
-BUILTIN_OBJS += builtin-commit.o
-BUILTIN_OBJS += builtin-config.o
-BUILTIN_OBJS += builtin-count-objects.o
-BUILTIN_OBJS += builtin-describe.o
-BUILTIN_OBJS += builtin-diff-files.o
-BUILTIN_OBJS += builtin-diff-index.o
-BUILTIN_OBJS += builtin-diff-tree.o
-BUILTIN_OBJS += builtin-diff.o
-BUILTIN_OBJS += builtin-fast-export.o
-BUILTIN_OBJS += builtin-fetch--tool.o
-BUILTIN_OBJS += builtin-fetch-pack.o
-BUILTIN_OBJS += builtin-fetch.o
-BUILTIN_OBJS += builtin-fmt-merge-msg.o
-BUILTIN_OBJS += builtin-for-each-ref.o
-BUILTIN_OBJS += builtin-fsck.o
-BUILTIN_OBJS += builtin-gc.o
-BUILTIN_OBJS += builtin-grep.o
+
 BUILTIN_OBJS += builtin-help.o
-BUILTIN_OBJS += builtin-init-db.o
-BUILTIN_OBJS += builtin-log.o
-BUILTIN_OBJS += builtin-ls-files.o
-BUILTIN_OBJS += builtin-ls-remote.o
-BUILTIN_OBJS += builtin-ls-tree.o
-BUILTIN_OBJS += builtin-mailinfo.o
-BUILTIN_OBJS += builtin-mailsplit.o
-BUILTIN_OBJS += builtin-merge.o
-BUILTIN_OBJS += builtin-merge-base.o
-BUILTIN_OBJS += builtin-merge-file.o
-BUILTIN_OBJS += builtin-merge-ours.o
-BUILTIN_OBJS += builtin-merge-recursive.o
-BUILTIN_OBJS += builtin-mv.o
-BUILTIN_OBJS += builtin-name-rev.o
-BUILTIN_OBJS += builtin-pack-objects.o
-BUILTIN_OBJS += builtin-pack-refs.o
-BUILTIN_OBJS += builtin-prune-packed.o
-BUILTIN_OBJS += builtin-prune.o
-BUILTIN_OBJS += builtin-push.o
-BUILTIN_OBJS += builtin-read-tree.o
-BUILTIN_OBJS += builtin-receive-pack.o
-BUILTIN_OBJS += builtin-reflog.o
-BUILTIN_OBJS += builtin-remote.o
-BUILTIN_OBJS += builtin-rerere.o
-BUILTIN_OBJS += builtin-reset.o
-BUILTIN_OBJS += builtin-rev-list.o
-BUILTIN_OBJS += builtin-rev-parse.o
-BUILTIN_OBJS += builtin-revert.o
-BUILTIN_OBJS += builtin-rm.o
-BUILTIN_OBJS += builtin-send-pack.o
-BUILTIN_OBJS += builtin-shortlog.o
-BUILTIN_OBJS += builtin-show-branch.o
-BUILTIN_OBJS += builtin-show-ref.o
-BUILTIN_OBJS += builtin-stripspace.o
-BUILTIN_OBJS += builtin-symbolic-ref.o
-BUILTIN_OBJS += builtin-tag.o
-BUILTIN_OBJS += builtin-tar-tree.o
-BUILTIN_OBJS += builtin-unpack-objects.o
-BUILTIN_OBJS += builtin-update-index.o
-BUILTIN_OBJS += builtin-update-ref.o
-BUILTIN_OBJS += builtin-upload-archive.o
-BUILTIN_OBJS += builtin-verify-pack.o
-BUILTIN_OBJS += builtin-verify-tag.o
-BUILTIN_OBJS += builtin-write-tree.o
-
-GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
+BUILTIN_OBJS += builtin-top.o
+
+PERFLIBS = $(LIB_FILE)
 EXTLIBS =
 
 #
@@ -625,221 +336,6 @@ EXTLIBS =
 # 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
-        THREADED_DELTA_SEARCH = YesPlease
-endif
-ifeq ($(uname_S),GNU/kFreeBSD)
-        NO_STRLCPY = YesPlease
-        THREADED_DELTA_SEARCH = YesPlease
-endif
-ifeq ($(uname_S),UnixWare)
-        CC = cc
-        NEEDS_SOCKET = YesPlease
-        NEEDS_NSL = YesPlease
-        NEEDS_SSL_WITH_CRYPTO = YesPlease
-        NEEDS_LIBICONV = YesPlease
-        SHELL_PATH = /usr/local/bin/bash
-        NO_IPV6 = YesPlease
-        NO_HSTRERROR = YesPlease
-        BASIC_CFLAGS += -Kthread
-        BASIC_CFLAGS += -I/usr/local/include
-        BASIC_LDFLAGS += -L/usr/local/lib
-        INSTALL = ginstall
-        TAR = gtar
-        NO_STRCASESTR = YesPlease
-        NO_MEMMEM = YesPlease
-endif
-ifeq ($(uname_S),SCO_SV)
-        ifeq ($(uname_R),3.2)
-                CFLAGS = -O2
-        endif
-        ifeq ($(uname_R),5)
-                CC = cc
-                BASIC_CFLAGS += -Kthread
-        endif
-        NEEDS_SOCKET = YesPlease
-        NEEDS_NSL = YesPlease
-        NEEDS_SSL_WITH_CRYPTO = YesPlease
-        NEEDS_LIBICONV = YesPlease
-        SHELL_PATH = /usr/bin/bash
-        NO_IPV6 = YesPlease
-        NO_HSTRERROR = YesPlease
-        BASIC_CFLAGS += -I/usr/local/include
-        BASIC_LDFLAGS += -L/usr/local/lib
-        NO_STRCASESTR = YesPlease
-        NO_MEMMEM = YesPlease
-        INSTALL = ginstall
-        TAR = gtar
-endif
-ifeq ($(uname_S),Darwin)
-        NEEDS_SSL_WITH_CRYPTO = YesPlease
-        NEEDS_LIBICONV = YesPlease
-        ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2)
-                OLD_ICONV = UnfortunatelyYes
-        endif
-        ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2)
-                NO_STRLCPY = YesPlease
-        endif
-        NO_MEMMEM = YesPlease
-        THREADED_DELTA_SEARCH = YesPlease
-        USE_ST_TIMESPEC = YesPlease
-endif
-ifeq ($(uname_S),SunOS)
-        NEEDS_SOCKET = YesPlease
-        NEEDS_NSL = YesPlease
-        SHELL_PATH = /bin/bash
-        NO_STRCASESTR = YesPlease
-        NO_MEMMEM = YesPlease
-        NO_HSTRERROR = YesPlease
-        NO_MKDTEMP = YesPlease
-        OLD_ICONV = UnfortunatelyYes
-        ifeq ($(uname_R),5.8)
-                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_MEMMEM = YesPlease
-        NO_SYMLINK_HEAD = YesPlease
-        NEEDS_LIBICONV = YesPlease
-        NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
-        NO_TRUSTABLE_FILEMODE = UnfortunatelyYes
-        OLD_ICONV = 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
-        NO_MEMMEM = YesPlease
-        BASIC_CFLAGS += -I/usr/local/include
-        BASIC_LDFLAGS += -L/usr/local/lib
-        DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
-        USE_ST_TIMESPEC = YesPlease
-        THREADED_DELTA_SEARCH = YesPlease
-        ifeq ($(shell expr "$(uname_R)" : '4\.'),2)
-                PTHREAD_LIBS = -pthread
-                NO_UINTMAX_T = YesPlease
-                NO_STRTOUMAX = YesPlease
-        endif
-endif
-ifeq ($(uname_S),OpenBSD)
-        NO_STRCASESTR = YesPlease
-        NO_MEMMEM = YesPlease
-        NEEDS_LIBICONV = YesPlease
-        BASIC_CFLAGS += -I/usr/local/include
-        BASIC_LDFLAGS += -L/usr/local/lib
-        THREADED_DELTA_SEARCH = YesPlease
-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 $(CC_LD_DYNPATH)/usr/pkg/lib
-        THREADED_DELTA_SEARCH = YesPlease
-endif
-ifeq ($(uname_S),AIX)
-        NO_STRCASESTR=YesPlease
-        NO_MEMMEM = YesPlease
-        NO_MKDTEMP = YesPlease
-        NO_STRLCPY = YesPlease
-        NO_NSEC = YesPlease
-        FREAD_READS_DIRECTORIES = UnfortunatelyYes
-        INTERNAL_QSORT = UnfortunatelyYes
-        NEEDS_LIBICONV=YesPlease
-        BASIC_CFLAGS += -D_LARGE_FILES
-        ifneq ($(shell expr "$(uname_V)" : '[1234]'),1)
-                THREADED_DELTA_SEARCH = YesPlease
-        else
-                NO_PTHREADS = YesPlease
-        endif
-endif
-ifeq ($(uname_S),GNU)
-        # GNU/Hurd
-        NO_STRLCPY=YesPlease
-endif
-ifeq ($(uname_S),IRIX64)
-        NO_IPV6=YesPlease
-        NO_SETENV=YesPlease
-        NO_STRCASESTR=YesPlease
-        NO_MEMMEM = 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
-ifeq ($(uname_S),HP-UX)
-        NO_IPV6=YesPlease
-        NO_SETENV=YesPlease
-        NO_STRCASESTR=YesPlease
-        NO_MEMMEM = YesPlease
-        NO_STRLCPY = YesPlease
-        NO_MKDTEMP = YesPlease
-        NO_UNSETENV = YesPlease
-        NO_HSTRERROR = YesPlease
-        NO_SYS_SELECT_H = YesPlease
-        SNPRINTF_RETURNS_BOGUS = YesPlease
-endif
-ifneq (,$(findstring CYGWIN,$(uname_S)))
-        COMPAT_OBJS += compat/cygwin.o
-endif
-ifneq (,$(findstring MINGW,$(uname_S)))
-        NO_PREAD = YesPlease
-        NO_OPENSSL = YesPlease
-        NO_CURL = YesPlease
-        NO_SYMLINK_HEAD = YesPlease
-        NO_IPV6 = YesPlease
-        NO_SETENV = YesPlease
-        NO_UNSETENV = YesPlease
-        NO_STRCASESTR = YesPlease
-        NO_STRLCPY = YesPlease
-        NO_MEMMEM = YesPlease
-        NO_PTHREADS = YesPlease
-        NEEDS_LIBICONV = YesPlease
-        OLD_ICONV = YesPlease
-        NO_C99_FORMAT = YesPlease
-        NO_STRTOUMAX = YesPlease
-        NO_MKDTEMP = YesPlease
-        SNPRINTF_RETURNS_BOGUS = YesPlease
-        NO_SVN_TESTS = YesPlease
-        NO_PERL_MAKEMAKER = YesPlease
-        RUNTIME_PREFIX = YesPlease
-        NO_POSIX_ONLY_PROGRAMS = YesPlease
-        NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
-        NO_NSEC = YesPlease
-        USE_WIN32_MMAP = YesPlease
-        COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/regex -Icompat/fnmatch
-        COMPAT_CFLAGS += -DSNPRINTF_SIZE_CORR=1
-        COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
-        COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o
-        EXTLIBS += -lws2_32
-        X = .exe
-endif
-ifneq (,$(findstring arm,$(uname_M)))
-        ARM_SHA1 = YesPlease
-endif
-
 -include config.mak.autogen
 -include config.mak
 
@@ -869,72 +365,12 @@ ifndef CC_LD_DYNPATH
         endif
 endif
 
-ifdef NO_CURL
-        BASIC_CFLAGS += -DNO_CURL
-else
-        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
-        BUILTIN_OBJS += builtin-http-fetch.o
-        EXTLIBS += $(CURL_LIBCURL)
-        LIB_OBJS += http.o http-walker.o
-        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
-                ifdef EXPATDIR
-                        BASIC_CFLAGS += -I$(EXPATDIR)/include
-                        EXPAT_LIBEXPAT = -L$(EXPATDIR)/$(lib) $(CC_LD_DYNPATH)$(EXPATDIR)/$(lib) -lexpat
-                else
-                        EXPAT_LIBEXPAT = -lexpat
-                endif
-        endif
-endif
-
 ifdef ZLIB_PATH
         BASIC_CFLAGS += -I$(ZLIB_PATH)/include
         EXTLIBS += -L$(ZLIB_PATH)/$(lib) $(CC_LD_DYNPATH)$(ZLIB_PATH)/$(lib)
 endif
 EXTLIBS += -lz
 
-ifndef NO_POSIX_ONLY_PROGRAMS
-        PROGRAMS += git-daemon$X
-        PROGRAMS += git-imap-send$X
-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
@@ -977,10 +413,6 @@ 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
@@ -1090,17 +522,6 @@ ifdef RUNTIME_PREFIX
         COMPAT_CFLAGS += -DRUNTIME_PREFIX
 endif
 
-ifdef NO_PTHREADS
-        THREADED_DELTA_SEARCH =
-        BASIC_CFLAGS += -DNO_PTHREADS
-else
-        EXTLIBS += $(PTHREAD_LIBS)
-endif
-
-ifdef THREADED_DELTA_SEARCH
-        BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
-        LIB_OBJS += thread-utils.o
-endif
 ifdef DIR_HAS_BSD_GROUP_SEMANTICS
         COMPAT_CFLAGS += -DDIR_HAS_BSD_GROUP_SEMANTICS
 endif
@@ -1148,14 +569,14 @@ endif
 # Shell quote (do not use $(call) to accommodate ancient setups);
 
 SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
-ETC_GITCONFIG_SQ = $(subst ','\'',$(ETC_GITCONFIG))
+ETC_PERFCONFIG_SQ = $(subst ','\'',$(ETC_PERFCONFIG))
 
 DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 bindir_SQ = $(subst ','\'',$(bindir))
 bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
 mandir_SQ = $(subst ','\'',$(mandir))
 infodir_SQ = $(subst ','\'',$(infodir))
-gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
+perfexecdir_SQ = $(subst ','\'',$(perfexecdir))
 template_dir_SQ = $(subst ','\'',$(template_dir))
 htmldir_SQ = $(subst ','\'',$(htmldir))
 prefix_SQ = $(subst ','\'',$(prefix))
@@ -1164,7 +585,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
 TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 
-LIBS = $(GITLIBS) $(EXTLIBS)
+LIBS = $(PERFLIBS) $(EXTLIBS)
 
 BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
         $(COMPAT_CFLAGS)
@@ -1180,15 +601,15 @@ export TAR INSTALL DESTDIR SHELL_PATH
 
 SHELL = $(SHELL_PATH)
 
-all:: shell_compatibility_test $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS
+all:: shell_compatibility_test $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) PERF-BUILD-OPTIONS
 ifneq (,$X)
-        $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$p' -ef '$p$X' || $(RM) '$p';)
+        $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) perf$X)), test '$p' -ef '$p$X' || $(RM) '$p';)
 endif
 
 all::
 ifndef NO_TCLTK
-        $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) gitexecdir='$(gitexec_instdir_SQ)' all
-        $(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all
+        $(QUIET_SUBDIR0)perf-gui $(QUIET_SUBDIR1) perfexecdir='$(perfexec_instdir_SQ)' all
+        $(QUIET_SUBDIR0)perfk-perf $(QUIET_SUBDIR1) all
 endif
 ifndef NO_PERL
         $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
@@ -1200,33 +621,33 @@ please_set_SHELL_PATH_to_a_more_modern_shell:
 
 shell_compatibility_test: please_set_SHELL_PATH_to_a_more_modern_shell
 
-strip: $(PROGRAMS) git$X
-        $(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
+strip: $(PROGRAMS) perf$X
+        $(STRIP) $(STRIP_OPTS) $(PROGRAMS) perf$X
 
-git.o: git.c common-cmds.h GIT-CFLAGS
-        $(QUIET_CC)$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
-                '-DGIT_HTML_PATH="$(htmldir_SQ)"' \
+perf.o: perf.c common-cmds.h PERF-CFLAGS
+        $(QUIET_CC)$(CC) -DPERF_VERSION='"$(PERF_VERSION)"' \
+                '-DPERF_HTML_PATH="$(htmldir_SQ)"' \
                 $(ALL_CFLAGS) -c $(filter %.c,$^)
 
-git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
-        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
+perf$X: perf.o $(BUILTIN_OBJS) $(PERFLIBS)
+        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ perf.o \
                 $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
 
-builtin-help.o: builtin-help.c common-cmds.h GIT-CFLAGS
+builtin-help.o: builtin-help.c common-cmds.h PERF-CFLAGS
         $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
-                '-DGIT_HTML_PATH="$(htmldir_SQ)"' \
-                '-DGIT_MAN_PATH="$(mandir_SQ)"' \
-                '-DGIT_INFO_PATH="$(infodir_SQ)"' $<
+                '-DPERF_HTML_PATH="$(htmldir_SQ)"' \
+                '-DPERF_MAN_PATH="$(mandir_SQ)"' \
+                '-DPERF_INFO_PATH="$(infodir_SQ)"' $<
 
-$(BUILT_INS): git$X
+$(BUILT_INS): perf$X
         $(QUIET_BUILT_IN)$(RM) $@ && \
-        ln git$X $@ 2>/dev/null || \
-        ln -s git$X $@ 2>/dev/null || \
-        cp git$X $@
+        ln perf$X $@ 2>/dev/null || \
+        ln -s perf$X $@ 2>/dev/null || \
+        cp perf$X $@
 
 common-cmds.h: ./generate-cmdlist.sh command-list.txt
 
-common-cmds.h: $(wildcard Documentation/git-*.txt)
+common-cmds.h: $(wildcard Documentation/perf-*.txt)
         $(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@
 
 $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
@@ -1234,152 +655,55 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
         sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
             -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
             -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
-            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
+            -e 's/@@PERF_VERSION@@/$(PERF_VERSION)/g' \
             -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
             $@.sh >$@+ && \
         chmod +x $@+ && \
         mv $@+ $@
 
-ifndef NO_PERL
-$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
-
-perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
-        $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
-
-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
-        $(QUIET_GEN)$(RM) $@ $@+ && \
-        INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
-        sed -e '1{' \
-            -e '        s|#!.*perl|#!$(PERL_PATH_SQ)|' \
-            -e '        h' \
-            -e '        s=.*=use lib (split(/:/, $$ENV{GITPERLLIB} || "@@INSTLIBDIR@@"));=' \
-            -e '        H' \
-            -e '        x' \
-            -e '}' \
-            -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
-            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
-            $@.perl >$@+ && \
-        chmod +x $@+ && \
-        mv $@+ $@
-
-gitweb/gitweb.cgi: gitweb/gitweb.perl
-        $(QUIET_GEN)$(RM) $@ $@+ && \
-        sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
-            -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
-            -e 's|++GIT_BINDIR++|$(bindir)|g' \
-            -e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \
-            -e 's|++GITWEB_CONFIG_SYSTEM++|$(GITWEB_CONFIG_SYSTEM)|g' \
-            -e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \
-            -e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \
-            -e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \
-            -e 's|"++GITWEB_PROJECT_MAXDEPTH++"|$(GITWEB_PROJECT_MAXDEPTH)|g' \
-            -e 's|++GITWEB_EXPORT_OK++|$(GITWEB_EXPORT_OK)|g' \
-            -e 's|++GITWEB_STRICT_EXPORT++|$(GITWEB_STRICT_EXPORT)|g' \
-            -e 's|++GITWEB_BASE_URL++|$(GITWEB_BASE_URL)|g' \
-            -e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \
-            -e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \
-            -e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \
-            -e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
-            -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
-            -e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \
-            -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \
-            $< >$@+ && \
-        chmod +x $@+ && \
-        mv $@+ $@
-
-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
-        $(QUIET_GEN)$(RM) $@ $@+ && \
-        sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
-            -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
-            -e '/@@GITWEB_CGI@@/r gitweb/gitweb.cgi' \
-            -e '/@@GITWEB_CGI@@/d' \
-            -e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \
-            -e '/@@GITWEB_CSS@@/d' \
-            -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
-            $@.sh > $@+ && \
-        chmod +x $@+ && \
-        mv $@+ $@
-else # NO_PERL
-$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
-        $(QUIET_GEN)$(RM) $@ $@+ && \
-        sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-            -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
-            unimplemented.sh >$@+ && \
-        chmod +x $@+ && \
-        mv $@+ $@
-endif # NO_PERL
-
 configure: configure.ac
         $(QUIET_GEN)$(RM) $@ $<+ && \
-        sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
+        sed -e 's/@@PERF_VERSION@@/$(PERF_VERSION)/g' \
             $< > $<+ && \
         autoconf -o $@ $<+ && \
         $(RM) $<+
 
-# These can record GIT_VERSION
-git.o git.spec \
+# These can record PERF_VERSION
+perf.o perf.spec \
         $(patsubst %.sh,%,$(SCRIPT_SH)) \
         $(patsubst %.perl,%,$(SCRIPT_PERL)) \
-        : GIT-VERSION-FILE
+        : PERF-VERSION-FILE
 
-%.o: %.c GIT-CFLAGS
+%.o: %.c PERF-CFLAGS
         $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
-%.s: %.c GIT-CFLAGS
+%.s: %.c PERF-CFLAGS
         $(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $<
 %.o: %.S
         $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
 
-exec_cmd.o: exec_cmd.c GIT-CFLAGS
+exec_cmd.o: exec_cmd.c PERF-CFLAGS
         $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
-                '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \
+                '-DPERF_EXEC_PATH="$(perfexecdir_SQ)"' \
                 '-DBINDIR="$(bindir_relative_SQ)"' \
                 '-DPREFIX="$(prefix_SQ)"' \
                 $<
 
-builtin-init-db.o: builtin-init-db.c GIT-CFLAGS
-        $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $<
-
-config.o: config.c GIT-CFLAGS
-        $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $<
+builtin-init-db.o: builtin-init-db.c PERF-CFLAGS
+        $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DDEFAULT_PERF_TEMPLATE_DIR='"$(template_dir_SQ)"' $<
 
-http.o: http.c GIT-CFLAGS
-        $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DGIT_USER_AGENT='"git/$(GIT_VERSION)"' $<
+config.o: config.c PERF-CFLAGS
+        $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<
 
-ifdef NO_EXPAT
-http-walker.o: http-walker.c http.h GIT-CFLAGS
-        $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DNO_EXPAT $<
-endif
-
-git-%$X: %.o $(GITLIBS)
+perf-%$X: %.o $(PERFLIBS)
         $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 
-git-imap-send$X: imap-send.o $(GITLIBS)
-        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
-                $(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL)
-
-http.o http-walker.o http-push.o transport.o: http.h
-
-git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
-        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
-                $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
-
 $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
-$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
+$(patsubst perf-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
 builtin-revert.o wt-status.o: wt-status.h
 
 $(LIB_FILE): $(LIB_OBJS)
         $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
 
-XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
-        xdiff/xmerge.o xdiff/xpatience.o
-$(XDIFF_OBJS): xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \
-        xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
-
-$(XDIFF_LIB): $(XDIFF_OBJS)
-        $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
-
-
 doc:
         $(MAKE) -C Documentation all
 
@@ -1409,19 +733,19 @@ cscope:
 
 ### Detect prefix changes
 TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):\
-             $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
+             $(bindir_SQ):$(perfexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
 
-GIT-CFLAGS: .FORCE-GIT-CFLAGS
+PERF-CFLAGS: .FORCE-PERF-CFLAGS
         @FLAGS='$(TRACK_CFLAGS)'; \
-            if test x"$$FLAGS" != x"`cat GIT-CFLAGS 2>/dev/null`" ; then \
+            if test x"$$FLAGS" != x"`cat PERF-CFLAGS 2>/dev/null`" ; then \
                 echo 1>&2 "    * new build flags or prefix"; \
-                echo "$$FLAGS" >GIT-CFLAGS; \
+                echo "$$FLAGS" >PERF-CFLAGS; \
             fi
 
 # We need to apply sq twice, once to protect from the shell
-# that runs GIT-BUILD-OPTIONS, and then again to protect it
+# that runs PERF-BUILD-OPTIONS, and then again to protect it
 # and the first level quoting from the shell that runs "echo".
-GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
+PERF-BUILD-OPTIONS: .FORCE-PERF-BUILD-OPTIONS
         @echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@
         @echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
         @echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
@@ -1431,14 +755,14 @@ GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
 ifndef NO_TCLTK
 TRACK_VARS = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')
 
-GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
+PERF-GUI-VARS: .FORCE-PERF-GUI-VARS
         @VARS='$(TRACK_VARS)'; \
             if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
                 echo 1>&2 "    * new Tcl/Tk interpreter location"; \
                 echo "$$VARS" >$@; \
             fi
 
-.PHONY: .FORCE-GIT-GUI-VARS
+.PHONY: .FORCE-PERF-GUI-VARS
 endif
 
 ### Testing rules
@@ -1476,7 +800,7 @@ test-parse-options$X: parse-options.o
 
 .PRECIOUS: $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
 
-test-%$X: test-%.o $(GITLIBS)
+test-%$X: test-%.o $(PERFLIBS)
         $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 
 check-sha1:: test-sha1$X
@@ -1506,40 +830,40 @@ template_instdir = $(prefix)/$(template_dir)
 endif
 export template_instdir
 
-ifneq ($(filter /%,$(firstword $(gitexecdir))),)
-gitexec_instdir = $(gitexecdir)
+ifneq ($(filter /%,$(firstword $(perfexecdir))),)
+perfexec_instdir = $(perfexecdir)
 else
-gitexec_instdir = $(prefix)/$(gitexecdir)
+perfexec_instdir = $(prefix)/$(perfexecdir)
 endif
-gitexec_instdir_SQ = $(subst ','\'',$(gitexec_instdir))
-export gitexec_instdir
+perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir))
+export perfexec_instdir
 
 install: all
         $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
-        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-        $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-        $(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
+        $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
+        $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
+        $(INSTALL) perf$X perf-upload-pack$X perf-receive-pack$X perf-upload-archive$X perf-shell$X perf-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
         $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
         $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
 ifndef NO_TCLTK
-        $(MAKE) -C gitk-git install
-        $(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install
+        $(MAKE) -C perfk-perf install
+        $(MAKE) -C perf-gui perfexecdir='$(perfexec_instdir_SQ)' install
 endif
 ifneq (,$X)
-        $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';)
+        $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) perf$X)), $(RM) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/$p';)
 endif
         bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
-        execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
-        { $(RM) "$$execdir/git-add$X" && \
-                ln "$$bindir/git$X" "$$execdir/git-add$X" 2>/dev/null || \
-                cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \
-        { for p in $(filter-out git-add$X,$(BUILT_INS)); do \
+        execdir=$$(cd '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' && pwd) && \
+        { $(RM) "$$execdir/perf-add$X" && \
+                ln "$$bindir/perf$X" "$$execdir/perf-add$X" 2>/dev/null || \
+                cp "$$bindir/perf$X" "$$execdir/perf-add$X"; } && \
+        { for p in $(filter-out perf-add$X,$(BUILT_INS)); do \
                 $(RM) "$$execdir/$$p" && \
-                ln "$$execdir/git-add$X" "$$execdir/$$p" 2>/dev/null || \
-                ln -s "git-add$X" "$$execdir/$$p" 2>/dev/null || \
-                cp "$$execdir/git-add$X" "$$execdir/$$p" || exit; \
+                ln "$$execdir/perf-add$X" "$$execdir/$$p" 2>/dev/null || \
+                ln -s "perf-add$X" "$$execdir/$$p" 2>/dev/null || \
+                cp "$$execdir/perf-add$X" "$$execdir/$$p" || exit; \
           done } && \
-        ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
+        ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/perf-add$X"
 
 install-doc:
         $(MAKE) -C Documentation install
@@ -1569,31 +893,31 @@ quick-install-html:
 
 ### Maintainer's dist rules
 
-git.spec: git.spec.in
-        sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
+perf.spec: perf.spec.in
+        sed -e 's/@@VERSION@@/$(PERF_VERSION)/g' < $< > $@+
         mv $@+ $@
 
-GIT_TARNAME=git-$(GIT_VERSION)
-dist: git.spec git-archive$(X) configure
-        ./git-archive --format=tar \
-                --prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
-        @mkdir -p $(GIT_TARNAME)
-        @cp git.spec configure $(GIT_TARNAME)
-        @echo $(GIT_VERSION) > $(GIT_TARNAME)/version
-        @$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
-        $(TAR) rf $(GIT_TARNAME).tar \
-                $(GIT_TARNAME)/git.spec \
-                $(GIT_TARNAME)/configure \
-                $(GIT_TARNAME)/version \
-                $(GIT_TARNAME)/git-gui/version
-        @$(RM) -r $(GIT_TARNAME)
-        gzip -f -9 $(GIT_TARNAME).tar
+PERF_TARNAME=perf-$(PERF_VERSION)
+dist: perf.spec perf-archive$(X) configure
+        ./perf-archive --format=tar \
+                --prefix=$(PERF_TARNAME)/ HEAD^{tree} > $(PERF_TARNAME).tar
+        @mkdir -p $(PERF_TARNAME)
+        @cp perf.spec configure $(PERF_TARNAME)
+        @echo $(PERF_VERSION) > $(PERF_TARNAME)/version
+        @$(MAKE) -C perf-gui TARDIR=../$(PERF_TARNAME)/perf-gui dist-version
+        $(TAR) rf $(PERF_TARNAME).tar \
+                $(PERF_TARNAME)/perf.spec \
+                $(PERF_TARNAME)/configure \
+                $(PERF_TARNAME)/version \
+                $(PERF_TARNAME)/perf-gui/version
+        @$(RM) -r $(PERF_TARNAME)
+        gzip -f -9 $(PERF_TARNAME).tar
 
 rpm: dist
-        $(RPMBUILD) -ta $(GIT_TARNAME).tar.gz
+        $(RPMBUILD) -ta $(PERF_TARNAME).tar.gz
 
-htmldocs = git-htmldocs-$(GIT_VERSION)
-manpages = git-manpages-$(GIT_VERSION)
+htmldocs = perf-htmldocs-$(PERF_VERSION)
+manpages = perf-manpages-$(PERF_VERSION)
 dist-doc:
         $(RM) -r .doc-tmp-dir
         mkdir .doc-tmp-dir
@@ -1618,51 +942,46 @@ distclean: clean
         $(RM) configure
 
 clean:
-        $(RM) *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
-                $(LIB_FILE) $(XDIFF_LIB)
-        $(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
+        $(RM) *.o $(LIB_FILE)
+        $(RM) $(ALL_PROGRAMS) $(BUILT_INS) perf$X
         $(RM) $(TEST_PROGRAMS)
         $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*
         $(RM) -r autom4te.cache
         $(RM) config.log config.mak.autogen config.mak.append config.status config.cache
-        $(RM) -r $(GIT_TARNAME) .doc-tmp-dir
-        $(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
+        $(RM) -r $(PERF_TARNAME) .doc-tmp-dir
+        $(RM) $(PERF_TARNAME).tar.gz perf-core_$(PERF_VERSION)-*.tar.gz
         $(RM) $(htmldocs).tar.gz $(manpages).tar.gz
         $(MAKE) -C Documentation/ clean
-ifndef NO_PERL
-        $(RM) gitweb/gitweb.cgi
-        $(MAKE) -C perl clean
-endif
         $(MAKE) -C templates/ clean
         $(MAKE) -C t/ clean
 ifndef NO_TCLTK
-        $(MAKE) -C gitk-git clean
-        $(MAKE) -C git-gui clean
+        $(MAKE) -C perfk-perf clean
+        $(MAKE) -C perf-gui clean
 endif
-        $(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS GIT-BUILD-OPTIONS
+        $(RM) PERF-VERSION-FILE PERF-CFLAGS PERF-GUI-VARS PERF-BUILD-OPTIONS
 
 .PHONY: all install clean strip
 .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
-.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags cscope .FORCE-GIT-CFLAGS
-.PHONY: .FORCE-GIT-BUILD-OPTIONS
+.PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope .FORCE-PERF-CFLAGS
+.PHONY: .FORCE-PERF-BUILD-OPTIONS
 
 ### Check documentation
 #
 check-docs::
-        @(for v in $(ALL_PROGRAMS) $(BUILT_INS) git gitk; \
+        @(for v in $(ALL_PROGRAMS) $(BUILT_INS) perf perfk; \
         do \
                 case "$$v" in \
-                git-merge-octopus | git-merge-ours | git-merge-recursive | \
-                git-merge-resolve | git-merge-subtree | \
-                git-fsck-objects | git-init-db | \
-                git-?*--?* ) continue ;; \
+                perf-merge-octopus | perf-merge-ours | perf-merge-recursive | \
+                perf-merge-resolve | perf-merge-subtree | \
+                perf-fsck-objects | perf-init-db | \
+                perf-?*--?* ) continue ;; \
                 esac ; \
                 test -f "Documentation/$$v.txt" || \
                 echo "no doc: $$v"; \
                 sed -e '/^#/d' command-list.txt | \
                 grep -q "^$$v[  ]" || \
                 case "$$v" in \
-                git) ;; \
+                perf) ;; \
                 *) echo "no link: $$v";; \
                 esac ; \
         done; \
@@ -1670,37 +989,37 @@ check-docs::
                 sed -e '/^#/d' \
                     -e 's/[     ].*//' \
                     -e 's/^/listed /' command-list.txt; \
-                ls -1 Documentation/git*txt | \
+                ls -1 Documentation/perf*txt | \
                 sed -e 's|Documentation/|documented |' \
                     -e 's/\.txt//'; \
         ) | while read how cmd; \
         do \
                 case "$$how,$$cmd" in \
-                *,git-citool | \
-                *,git-gui | \
-                *,git-help | \
-                documented,gitattributes | \
-                documented,gitignore | \
-                documented,gitmodules | \
-                documented,gitcli | \
-                documented,git-tools | \
-                documented,gitcore-tutorial | \
-                documented,gitcvs-migration | \
-                documented,gitdiffcore | \
-                documented,gitglossary | \
-                documented,githooks | \
-                documented,gitrepository-layout | \
-                documented,gittutorial | \
-                documented,gittutorial-2 | \
+                *,perf-citool | \
+                *,perf-gui | \
+                *,perf-help | \
+                documented,perfattributes | \
+                documented,perfignore | \
+                documented,perfmodules | \
+                documented,perfcli | \
+                documented,perf-tools | \
+                documented,perfcore-tutorial | \
+                documented,perfcvs-migration | \
+                documented,perfdiffcore | \
+                documented,perfglossary | \
+                documented,perfhooks | \
+                documented,perfrepository-layout | \
+                documented,perftutorial | \
+                documented,perftutorial-2 | \
                 sentinel,not,matching,is,ok ) continue ;; \
                 esac; \
-                case " $(ALL_PROGRAMS) $(BUILT_INS) git gitk " in \
+                case " $(ALL_PROGRAMS) $(BUILT_INS) perf perfk " in \
                 *" $$cmd "*)    ;; \
                 *) echo "removed but $$how: $$cmd" ;; \
                 esac; \
         done ) | sort
 
-### Make sure built-ins do not have dups and listed in git.c
+### Make sure built-ins do not have dups and listed in perf.c
 #
 check-builtins::
         ./check-builtins.sh