2005-12-01 21:26:41 +01:00
|
|
|
# The default target of this Makefile is...
|
|
|
|
|
all:
|
|
|
|
|
|
2005-07-29 17:48:26 +02:00
|
|
|
# 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.
|
2005-04-13 11:20:38 +02:00
|
|
|
#
|
2006-03-01 00:07:20 +01:00
|
|
|
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
|
|
|
|
|
# This also implies MOZILLA_SHA1.
|
2005-05-23 00:08:15 +02:00
|
|
|
#
|
2005-11-02 20:19:24 +01:00
|
|
|
# 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.
|
2005-07-31 02:14:23 +02:00
|
|
|
#
|
2005-09-19 16:11:19 +02:00
|
|
|
# Define CURLDIR=/foo/bar if your curl header and library files are in
|
|
|
|
|
# /foo/bar/include and /foo/bar/lib directories.
|
|
|
|
|
#
|
2005-11-02 20:19:24 +01:00
|
|
|
# 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.
|
|
|
|
|
#
|
2006-01-20 02:13:51 +01:00
|
|
|
# Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent.
|
|
|
|
|
#
|
2006-01-20 02:13:57 +01:00
|
|
|
# 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).
|
|
|
|
|
#
|
2005-09-19 03:30:50 +02:00
|
|
|
# Define NO_STRCASESTR if you don't have strcasestr.
|
|
|
|
|
#
|
2005-12-03 00:08:28 +01:00
|
|
|
# Define NO_SETENV if you don't have setenv in the C library.
|
|
|
|
|
#
|
2005-11-15 06:59:50 +01:00
|
|
|
# Define USE_SYMLINK_HEAD if you want .git/HEAD to be a symbolic link.
|
|
|
|
|
# Don't enable it on Windows.
|
|
|
|
|
#
|
2005-07-29 17:48:26 +02:00
|
|
|
# Define PPC_SHA1 environment variable when running make to make use of
|
|
|
|
|
# a bundled SHA1 routine optimized for PowerPC.
|
2005-09-07 21:22:56 +02:00
|
|
|
#
|
2005-09-20 18:27:13 +02:00
|
|
|
# Define ARM_SHA1 environment variable when running make to make use of
|
|
|
|
|
# a bundled SHA1 routine optimized for ARM.
|
|
|
|
|
#
|
2005-09-07 21:22:56 +02:00
|
|
|
# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
|
2005-09-06 01:24:03 +02:00
|
|
|
#
|
2005-09-07 21:22:56 +02:00
|
|
|
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
|
2005-09-06 01:24:03 +02:00
|
|
|
#
|
|
|
|
|
# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
|
|
|
|
|
# Patrick Mauritz).
|
|
|
|
|
#
|
2005-10-09 00:54:36 +02:00
|
|
|
# Define NO_MMAP if you want to avoid mmap.
|
|
|
|
|
#
|
2005-09-20 04:47:54 +02:00
|
|
|
# Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3.
|
|
|
|
|
#
|
2005-09-29 01:52:21 +02:00
|
|
|
# Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
|
|
|
|
|
#
|
2006-01-20 02:13:32 +01:00
|
|
|
# Define NO_SOCKADDR_STORAGE if your platform does not have struct
|
|
|
|
|
# sockaddr_storage.
|
|
|
|
|
#
|
2006-02-16 09:38:01 +01:00
|
|
|
# Define NO_ICONV if your libc does not properly support iconv.
|
|
|
|
|
#
|
2006-02-17 15:23:16 +01:00
|
|
|
# Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
|
|
|
|
|
# a missing newline at the end of the file.
|
|
|
|
|
#
|
2006-02-18 13:01:18 +01:00
|
|
|
# Define NO_PYTHON if you want to loose all benefits of the recursive merge.
|
|
|
|
|
#
|
2005-07-29 17:48:26 +02:00
|
|
|
# Define COLLISION_CHECK below if you believe that SHA1's
|
|
|
|
|
# 1461501637330902918203684832716283019655932542976 hashes do not give you
|
|
|
|
|
# sufficient guarantee that no collisions between objects will ever happen.
|
|
|
|
|
|
|
|
|
|
# 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.
|
|
|
|
|
|
2005-12-27 23:40:17 +01:00
|
|
|
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
|
2006-02-14 00:15:14 +01:00
|
|
|
@$(SHELL_PATH) ./GIT-VERSION-GEN
|
2005-12-27 23:40:17 +01:00
|
|
|
-include GIT-VERSION-FILE
|
2005-07-07 22:09:50 +02:00
|
|
|
|
2006-02-21 00:36:28 +01:00
|
|
|
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')
|
|
|
|
|
|
2005-11-13 10:46:13 +01:00
|
|
|
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
2005-11-05 08:50:09 +01:00
|
|
|
|
2005-08-06 07:36:15 +02:00
|
|
|
CFLAGS = -g -O2 -Wall
|
2005-11-13 10:46:13 +01:00
|
|
|
LDFLAGS =
|
2005-11-05 08:50:09 +01:00
|
|
|
ALL_CFLAGS = $(CFLAGS)
|
2005-11-13 10:46:13 +01:00
|
|
|
ALL_LDFLAGS = $(LDFLAGS)
|
2006-01-13 06:42:25 +01:00
|
|
|
STRIP ?= strip
|
2005-05-07 10:41:54 +02:00
|
|
|
|
2005-08-06 07:36:15 +02:00
|
|
|
prefix = $(HOME)
|
|
|
|
|
bindir = $(prefix)/bin
|
2006-02-21 00:36:28 +01:00
|
|
|
gitexecdir = $(bindir)
|
2005-08-06 07:36:15 +02:00
|
|
|
template_dir = $(prefix)/share/git-core/templates/
|
2005-09-11 02:46:27 +02:00
|
|
|
GIT_PYTHON_DIR = $(prefix)/share/git-core/python
|
2005-08-05 01:56:38 +02:00
|
|
|
# DESTDIR=
|
2005-04-13 11:14:06 +02:00
|
|
|
|
2005-08-06 07:36:15 +02:00
|
|
|
CC = gcc
|
|
|
|
|
AR = ar
|
2005-09-23 19:41:40 +02:00
|
|
|
TAR = tar
|
2005-08-06 07:36:15 +02:00
|
|
|
INSTALL = install
|
|
|
|
|
RPMBUILD = rpmbuild
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2005-07-03 19:02:35 +02:00
|
|
|
# sparse is architecture-neutral, which means that we need to tell it
|
|
|
|
|
# explicitly what architecture to check for. Fix this up for yours..
|
2005-08-06 07:36:15 +02:00
|
|
|
SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
|
2005-07-03 19:02:35 +02:00
|
|
|
|
2005-07-29 17:50:24 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
### --- END CONFIGURATION SECTION ---
|
|
|
|
|
|
2005-09-08 02:26:23 +02:00
|
|
|
SCRIPT_SH = \
|
|
|
|
|
git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
|
|
|
|
|
git-cherry.sh git-clone.sh git-commit.sh \
|
|
|
|
|
git-count-objects.sh git-diff.sh git-fetch.sh \
|
|
|
|
|
git-format-patch.sh git-log.sh git-ls-remote.sh \
|
2005-12-20 03:03:31 +01:00
|
|
|
git-merge-one-file.sh git-parse-remote.sh \
|
2005-09-08 02:26:23 +02:00
|
|
|
git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
|
|
|
|
|
git-repack.sh git-request-pull.sh git-reset.sh \
|
2006-02-22 00:04:51 +01:00
|
|
|
git-resolve.sh git-revert.sh git-rm.sh git-sh-setup.sh \
|
2005-11-17 06:32:44 +01:00
|
|
|
git-tag.sh git-verify-tag.sh git-whatchanged.sh \
|
2005-10-07 12:44:18 +02:00
|
|
|
git-applymbox.sh git-applypatch.sh git-am.sh \
|
2005-09-11 02:56:19 +02:00
|
|
|
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
|
2005-11-08 00:15:34 +01:00
|
|
|
git-merge-resolve.sh git-merge-ours.sh git-grep.sh \
|
2005-11-13 11:07:02 +01:00
|
|
|
git-lost-found.sh
|
2005-09-08 02:26:23 +02:00
|
|
|
|
|
|
|
|
SCRIPT_PERL = \
|
|
|
|
|
git-archimport.perl git-cvsimport.perl git-relink.perl \
|
2006-01-29 08:15:24 +01:00
|
|
|
git-shortlog.perl git-fmt-merge-msg.perl git-rerere.perl \
|
2006-02-23 04:20:55 +01:00
|
|
|
git-annotate.perl git-cvsserver.perl \
|
2005-11-07 05:57:08 +01:00
|
|
|
git-svnimport.perl git-mv.perl git-cvsexportcommit.perl
|
2005-07-31 02:31:47 +02:00
|
|
|
|
2005-09-11 02:46:27 +02:00
|
|
|
SCRIPT_PYTHON = \
|
2005-09-13 08:22:26 +02:00
|
|
|
git-merge-recursive.py
|
2005-09-11 02:46:27 +02:00
|
|
|
|
2005-11-22 00:44:15 +01:00
|
|
|
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
|
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
|
|
|
|
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
|
2006-02-10 09:45:59 +01:00
|
|
|
git-cherry-pick git-show git-status
|
2005-11-22 00:44:15 +01:00
|
|
|
|
2005-09-07 21:22:56 +02:00
|
|
|
# The ones that do not have to link with lcrypto nor lz.
|
|
|
|
|
SIMPLE_PROGRAMS = \
|
2006-02-19 21:16:08 +01:00
|
|
|
git-get-tar-commit-id$X git-mailsplit$X \
|
2005-11-17 06:32:44 +01:00
|
|
|
git-stripspace$X git-daemon$X
|
2005-09-07 21:22:56 +02:00
|
|
|
|
2006-01-13 06:37:17 +01:00
|
|
|
# ... and all the rest that could be moved out of bindir to gitexecdir
|
2005-09-08 02:26:23 +02:00
|
|
|
PROGRAMS = \
|
2005-10-03 21:04:44 +02:00
|
|
|
git-apply$X git-cat-file$X \
|
|
|
|
|
git-checkout-index$X git-clone-pack$X git-commit-tree$X \
|
|
|
|
|
git-convert-objects$X git-diff-files$X \
|
|
|
|
|
git-diff-index$X git-diff-stages$X \
|
|
|
|
|
git-diff-tree$X git-fetch-pack$X git-fsck-objects$X \
|
2006-02-25 01:16:10 +01:00
|
|
|
git-hash-object$X git-index-pack$X git-init-db$X git-local-fetch$X \
|
|
|
|
|
git-ls-files$X git-ls-tree$X git-mailinfo$X git-merge-base$X \
|
2006-02-21 06:50:01 +01:00
|
|
|
git-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \
|
2005-10-03 21:04:44 +02:00
|
|
|
git-peek-remote$X git-prune-packed$X git-read-tree$X \
|
|
|
|
|
git-receive-pack$X git-rev-list$X git-rev-parse$X \
|
2005-10-23 23:30:45 +02:00
|
|
|
git-send-pack$X git-show-branch$X git-shell$X \
|
2005-10-03 21:04:44 +02:00
|
|
|
git-show-index$X git-ssh-fetch$X \
|
|
|
|
|
git-ssh-upload$X git-tar-tree$X git-unpack-file$X \
|
|
|
|
|
git-unpack-objects$X git-update-index$X git-update-server-info$X \
|
|
|
|
|
git-upload-pack$X git-verify-pack$X git-write-tree$X \
|
2005-10-14 03:57:39 +02:00
|
|
|
git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
|
Add a "git-describe" command
It shows you the most recent tag that is reachable from a particular
commit is.
Maybe this is something that "git-name-rev" should be taught to do,
instead of having a separate command for it. Regardless, I find it useful.
What it does is to take any random commit, and "name" it by looking up the
most recent commit that is tagged and reachable from that commit. If the
match is exact, it will just print out that ref-name directly. Otherwise
it will print out the ref-name, followed by the 8-character "short SHA".
IOW, with something like Junios current tree, I get:
[torvalds@g5 git]$ git-describe parent
refs/tags/v1.0.4-g2414721b
ie the current head of my "parent" branch (ie Junio) is based on v1.0.4,
but since it has a few commits on top of that, it has added the git hash
of the thing to the end: "-g" + 8-char shorthand for the commit
2414721b194453f058079d897d13c4e377f92dc6.
Doing a "git-describe" on a tag-name will just show the full tag path:
[torvalds@g5 git]$ git-describe v1.0.4
refs/tags/v1.0.4
unless there are _other_ tags pointing to that commit, in which case it
will just choose one at random.
This is useful for two things:
- automatic version naming in Makefiles, for example. We could use it in
git itself: when doing "git --version", we could use this to give a
much more useful description of exactly what version was installed.
- for any random commit (say, you use "gitk <pathname>" or
"git-whatchanged" to look at what has changed in some file), you can
figure out what the last version of the repo was. Ie, say I find a bug
in commit 39ca371c45b04cd50d0974030ae051906fc516b6, I just do:
[torvalds@g5 linux]$ git-describe 39ca371c45b04cd50d0974030ae051906fc516b6
refs/tags/v2.6.14-rc4-g39ca371c
and I now know that it was _not_ in v2.6.14-rc4, but was presumably in
v2.6.14-rc5.
The latter is useful when you want to see what "version timeframe" a
commit happened in.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-24 22:50:45 +01:00
|
|
|
git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
|
2006-03-10 06:32:50 +01:00
|
|
|
git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
|
2005-11-22 00:44:15 +01:00
|
|
|
|
2006-01-13 06:37:17 +01:00
|
|
|
# what 'all' will build and 'install' will install, in gitexecdir
|
2006-01-11 03:12:17 +01:00
|
|
|
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2005-09-30 09:27:11 +02:00
|
|
|
# Backward compatibility -- to be removed after 1.0
|
2005-09-30 19:46:25 +02:00
|
|
|
PROGRAMS += git-ssh-pull$X git-ssh-push$X
|
2005-09-15 23:56:37 +02:00
|
|
|
|
2005-11-21 06:11:22 +01:00
|
|
|
# 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/bin/python
|
|
|
|
|
endif
|
|
|
|
|
|
2005-09-11 02:46:27 +02:00
|
|
|
PYMODULES = \
|
|
|
|
|
gitMergeCommon.py
|
|
|
|
|
|
2005-04-18 21:49:39 +02:00
|
|
|
LIB_FILE=libgit.a
|
Use a *real* built-in diff generator
This uses a simplified libxdiff setup to generate unified diffs _without_
doing fork/execve of GNU "diff".
This has several huge advantages, for example:
Before:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m24.818s
user 0m13.332s
sys 0m8.664s
After:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m4.563s
user 0m2.944s
sys 0m1.580s
and the fact that this should be a lot more portable (ie we can ignore all
the issues with doing fork/execve under Windows).
Perhaps even more importantly, this allows us to do diffs without actually
ever writing out the git file contents to a temporary file (and without
any of the shell quoting issues on filenames etc etc).
NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
current "diff-core" code actually will always write the temp-files,
because it used to be something that you simply had to do. So this current
one actually writes a temp-file like before, and then reads it into memory
again just to do the diff. Stupid.
But if this basic infrastructure is accepted, we can start switching over
diff-core to not write temp-files, which should speed things up even
further, especially when doing big tree-to-tree diffs.
Now, in the interest of full disclosure, I should also point out a few
downsides:
- the libxdiff algorithm is different, and I bet GNU diff has gotten a
lot more testing. And the thing is, generating a diff is not an exact
science - you can get two different diffs (and you will), and they can
both be perfectly valid. So it's not possible to "validate" the
libxdiff output by just comparing it against GNU diff.
- GNU diff does some nice eye-candy, like trying to figure out what the
last function was, and adding that information to the "@@ .." line.
libxdiff doesn't do that.
- The libxdiff thing has some known deficiencies. In particular, it gets
the "\No newline at end of file" case wrong. So this is currently for
the experimental branch only. I hope Davide will help fix it.
That said, I think the huge performance advantage, and the fact that it
integrates better is definitely worth it. But it should go into a
development branch at least due to the missing newline issue.
Technical note: this is based on libxdiff-0.17, but I did some surgery to
get rid of the extraneous fat - stuff that git doesn't need, and seriously
cutting down on mmfile_t, which had much more capabilities than the diff
algorithm either needed or used. In this version, "mmfile_t" is just a
trivial <pointer,length> tuple.
That said, I tried to keep the differences to simple removals, so that you
can do a diff between this and the libxdiff origin, and you'll basically
see just things getting deleted. Even the mmfile_t simplifications are
left in a state where the diffs should be readable.
Apologies to Davide, whom I'd love to get feedback on this all from (I
wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
complex format had a helper function for that, but I did my surgery with
the goal in mind that eventually we _should_ just do
mmfile_t mf;
buf = read_sha1_file(sha1, type, &size);
mf->ptr = buf;
mf->size = size;
.. use "mf" directly ..
which was really a nightmare with the old "helpful" mmfile_t, and really
is that easy with the new cut-down interfaces).
[ Btw, as any hawk-eye can see from the diff, this was actually generated
with itself, so it is "self-hosting". That's about all the testing it
has gotten, along with the above kernel diff, which eye-balls correctly,
but shows the newline issue when you double-check it with "git-apply" ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-25 05:13:22 +01:00
|
|
|
XDIFF_LIB=xdiff/lib.a
|
[PATCH] Add update-server-info.
The git-update-server-info command prepares informational files
to help clients discover the contents of a repository, and pull
from it via a dumb transport protocols. Currently, the
following files are produced.
- The $repo/info/refs file lists the name of heads and tags
available in the $repo/refs/ directory, along with their
SHA1. This can be used by git-ls-remote command running on
the client side.
- The $repo/info/rev-cache file describes the commit ancestry
reachable from references in the $repo/refs/ directory. This
file is in an append-only binary format to make the server
side friendly to rsync mirroring scheme, and can be read by
git-show-rev-cache command.
- The $repo/objects/info/pack file lists the name of the packs
available, the interdependencies among them, and the head
commits and tags contained in them. Along with the other two
files, this is designed to help clients to make smart pull
decisions.
The git-receive-pack command is changed to invoke it at the end,
so just after a push to a public repository finishes via "git
push", the server info is automatically updated.
In addition, building of the rev-cache file can be done by a
standalone git-build-rev-cache command separately.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-24 02:54:41 +02:00
|
|
|
|
2005-09-08 02:26:23 +02:00
|
|
|
LIB_H = \
|
2006-03-04 11:51:19 +01:00
|
|
|
blob.h cache.h commit.h csum-file.h delta.h \
|
2006-03-01 00:07:20 +01:00
|
|
|
diff.h object.h pack.h pkt-line.h quote.h refs.h \
|
2006-02-26 01:19:46 +01:00
|
|
|
run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h
|
2005-07-31 21:17:43 +02:00
|
|
|
|
2005-09-08 02:26:23 +02:00
|
|
|
DIFF_OBJS = \
|
|
|
|
|
diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
|
2006-03-01 01:01:36 +01:00
|
|
|
diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
|
|
|
|
|
diffcore-delta.o
|
2005-04-26 03:26:45 +02:00
|
|
|
|
2005-09-08 02:26:23 +02:00
|
|
|
LIB_OBJS = \
|
2006-03-04 11:51:19 +01:00
|
|
|
blob.o commit.o connect.o csum-file.o \
|
2006-01-11 03:12:17 +01:00
|
|
|
date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
|
2005-09-08 02:26:23 +02:00
|
|
|
object.o pack-check.o patch-delta.o path.o pkt-line.o \
|
2005-09-14 22:08:55 +02:00
|
|
|
quote.o read-cache.o refs.o run-command.o \
|
2005-09-08 02:26:23 +02:00
|
|
|
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
|
2005-10-22 10:28:13 +02:00
|
|
|
tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
|
2006-02-28 20:26:21 +01:00
|
|
|
fetch-clone.o revision.o pager.o \
|
2005-10-13 20:03:18 +02:00
|
|
|
$(DIFF_OBJS)
|
2005-05-10 02:57:56 +02:00
|
|
|
|
Use a *real* built-in diff generator
This uses a simplified libxdiff setup to generate unified diffs _without_
doing fork/execve of GNU "diff".
This has several huge advantages, for example:
Before:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m24.818s
user 0m13.332s
sys 0m8.664s
After:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m4.563s
user 0m2.944s
sys 0m1.580s
and the fact that this should be a lot more portable (ie we can ignore all
the issues with doing fork/execve under Windows).
Perhaps even more importantly, this allows us to do diffs without actually
ever writing out the git file contents to a temporary file (and without
any of the shell quoting issues on filenames etc etc).
NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
current "diff-core" code actually will always write the temp-files,
because it used to be something that you simply had to do. So this current
one actually writes a temp-file like before, and then reads it into memory
again just to do the diff. Stupid.
But if this basic infrastructure is accepted, we can start switching over
diff-core to not write temp-files, which should speed things up even
further, especially when doing big tree-to-tree diffs.
Now, in the interest of full disclosure, I should also point out a few
downsides:
- the libxdiff algorithm is different, and I bet GNU diff has gotten a
lot more testing. And the thing is, generating a diff is not an exact
science - you can get two different diffs (and you will), and they can
both be perfectly valid. So it's not possible to "validate" the
libxdiff output by just comparing it against GNU diff.
- GNU diff does some nice eye-candy, like trying to figure out what the
last function was, and adding that information to the "@@ .." line.
libxdiff doesn't do that.
- The libxdiff thing has some known deficiencies. In particular, it gets
the "\No newline at end of file" case wrong. So this is currently for
the experimental branch only. I hope Davide will help fix it.
That said, I think the huge performance advantage, and the fact that it
integrates better is definitely worth it. But it should go into a
development branch at least due to the missing newline issue.
Technical note: this is based on libxdiff-0.17, but I did some surgery to
get rid of the extraneous fat - stuff that git doesn't need, and seriously
cutting down on mmfile_t, which had much more capabilities than the diff
algorithm either needed or used. In this version, "mmfile_t" is just a
trivial <pointer,length> tuple.
That said, I tried to keep the differences to simple removals, so that you
can do a diff between this and the libxdiff origin, and you'll basically
see just things getting deleted. Even the mmfile_t simplifications are
left in a state where the diffs should be readable.
Apologies to Davide, whom I'd love to get feedback on this all from (I
wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
complex format had a helper function for that, but I did my surgery with
the goal in mind that eventually we _should_ just do
mmfile_t mf;
buf = read_sha1_file(sha1, type, &size);
mf->ptr = buf;
mf->size = size;
.. use "mf" directly ..
which was really a nightmare with the old "helpful" mmfile_t, and really
is that easy with the new cut-down interfaces).
[ Btw, as any hawk-eye can see from the diff, this was actually generated
with itself, so it is "self-hosting". That's about all the testing it
has gotten, along with the above kernel diff, which eye-balls correctly,
but shows the newline issue when you double-check it with "git-apply" ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-25 05:13:22 +01:00
|
|
|
LIBS = $(LIB_FILE) $(XDIFF_LIB)
|
2005-04-21 21:14:46 +02:00
|
|
|
LIBS += -lz
|
2005-04-21 21:33:22 +02:00
|
|
|
|
2005-09-23 19:41:40 +02:00
|
|
|
#
|
|
|
|
|
# Platform specific tweaks
|
|
|
|
|
#
|
2005-10-09 21:52:35 +02:00
|
|
|
|
|
|
|
|
# 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),Darwin)
|
2005-09-07 21:22:56 +02:00
|
|
|
NEEDS_SSL_WITH_CRYPTO = YesPlease
|
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
2005-11-06 13:33:07 +01:00
|
|
|
## fink
|
2006-02-28 15:03:48 +01:00
|
|
|
ifeq ($(shell test -d /sw/lib && echo y),y)
|
|
|
|
|
ALL_CFLAGS += -I/sw/include
|
|
|
|
|
ALL_LDFLAGS += -L/sw/lib
|
|
|
|
|
endif
|
2005-11-06 13:33:07 +01:00
|
|
|
## darwinports
|
2006-02-28 15:03:48 +01:00
|
|
|
ifeq ($(shell test -d /opt/local/lib && echo y),y)
|
|
|
|
|
ALL_CFLAGS += -I/opt/local/include
|
|
|
|
|
ALL_LDFLAGS += -L/opt/local/lib
|
|
|
|
|
endif
|
2005-09-07 21:22:56 +02:00
|
|
|
endif
|
2005-10-09 21:52:35 +02:00
|
|
|
ifeq ($(uname_S),SunOS)
|
2005-09-06 01:24:03 +02:00
|
|
|
NEEDS_SOCKET = YesPlease
|
2005-09-12 07:25:49 +02:00
|
|
|
NEEDS_NSL = YesPlease
|
2005-09-23 19:41:40 +02:00
|
|
|
SHELL_PATH = /bin/bash
|
|
|
|
|
NO_STRCASESTR = YesPlease
|
2005-12-03 00:08:28 +01:00
|
|
|
ifeq ($(uname_R),5.8)
|
2006-02-21 00:36:28 +01:00
|
|
|
NEEDS_LIBICONV = YesPlease
|
2006-01-25 21:38:36 +01:00
|
|
|
NO_UNSETENV = YesPlease
|
2005-12-03 00:08:28 +01:00
|
|
|
NO_SETENV = YesPlease
|
|
|
|
|
endif
|
2005-09-23 19:41:40 +02:00
|
|
|
INSTALL = ginstall
|
|
|
|
|
TAR = gtar
|
2005-11-05 08:50:09 +01:00
|
|
|
ALL_CFLAGS += -D__EXTENSIONS__
|
2005-09-06 01:24:03 +02:00
|
|
|
endif
|
2005-10-09 21:52:35 +02:00
|
|
|
ifeq ($(uname_O),Cygwin)
|
2006-01-20 02:13:57 +01:00
|
|
|
NO_D_TYPE_IN_DIRENT = YesPlease
|
2006-01-20 02:13:51 +01:00
|
|
|
NO_D_INO_IN_DIRENT = YesPlease
|
2005-09-29 01:37:37 +02:00
|
|
|
NO_STRCASESTR = YesPlease
|
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
2005-11-17 20:29:47 +01:00
|
|
|
# There are conflicting reports about this.
|
|
|
|
|
# On some boxes NO_MMAP is needed, and not so elsewhere.
|
|
|
|
|
# Try uncommenting this if you see things break -- YMMV.
|
|
|
|
|
# NO_MMAP = YesPlease
|
2005-09-29 01:52:21 +02:00
|
|
|
NO_IPV6 = YesPlease
|
2005-09-29 04:08:37 +02:00
|
|
|
X = .exe
|
2005-09-20 18:27:13 +02:00
|
|
|
endif
|
2006-01-26 19:04:30 +01:00
|
|
|
ifeq ($(uname_S),FreeBSD)
|
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
|
ALL_CFLAGS += -I/usr/local/include
|
|
|
|
|
ALL_LDFLAGS += -L/usr/local/lib
|
|
|
|
|
endif
|
2005-10-09 21:52:35 +02:00
|
|
|
ifeq ($(uname_S),OpenBSD)
|
2005-10-10 20:51:11 +02:00
|
|
|
NO_STRCASESTR = YesPlease
|
2005-10-01 08:23:26 +02:00
|
|
|
NEEDS_LIBICONV = YesPlease
|
2005-11-13 10:46:13 +01:00
|
|
|
ALL_CFLAGS += -I/usr/local/include
|
|
|
|
|
ALL_LDFLAGS += -L/usr/local/lib
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(uname_S),NetBSD)
|
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
|
ALL_CFLAGS += -I/usr/pkg/include
|
|
|
|
|
ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
|
2005-10-01 08:23:26 +02:00
|
|
|
endif
|
2005-12-06 23:20:16 +01:00
|
|
|
ifeq ($(uname_S),AIX)
|
|
|
|
|
NO_STRCASESTR=YesPlease
|
|
|
|
|
NEEDS_LIBICONV=YesPlease
|
|
|
|
|
endif
|
2006-02-17 15:23:41 +01:00
|
|
|
ifeq ($(uname_S),IRIX64)
|
|
|
|
|
NO_IPV6=YesPlease
|
|
|
|
|
NO_SETENV=YesPlease
|
|
|
|
|
NO_STRCASESTR=YesPlease
|
|
|
|
|
NO_SOCKADDR_STORAGE=YesPlease
|
|
|
|
|
SHELL_PATH=/usr/gnu/bin/bash
|
|
|
|
|
ALL_CFLAGS += -DPATH_MAX=1024
|
|
|
|
|
# for now, build 32-bit version
|
|
|
|
|
ALL_LDFLAGS += -L/usr/lib32
|
|
|
|
|
endif
|
2005-10-09 21:52:35 +02:00
|
|
|
ifneq (,$(findstring arm,$(uname_M)))
|
|
|
|
|
ARM_SHA1 = YesPlease
|
|
|
|
|
endif
|
2005-09-07 21:22:56 +02:00
|
|
|
|
2005-10-12 00:22:47 +02:00
|
|
|
-include config.mak
|
2005-09-07 21:22:56 +02:00
|
|
|
|
2005-12-01 02:32:01 +01:00
|
|
|
ifdef WITH_OWN_SUBPROCESS_PY
|
|
|
|
|
PYMODULES += compat/subprocess.py
|
|
|
|
|
else
|
2006-02-19 21:13:48 +01:00
|
|
|
ifeq ($(NO_PYTHON),)
|
|
|
|
|
ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK)
|
|
|
|
|
PYMODULES += compat/subprocess.py
|
|
|
|
|
endif
|
2005-12-01 02:32:01 +01:00
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifdef WITH_SEND_EMAIL
|
|
|
|
|
SCRIPT_PERL += git-send-email.perl
|
|
|
|
|
endif
|
|
|
|
|
|
2005-09-23 19:41:40 +02:00
|
|
|
ifndef NO_CURL
|
|
|
|
|
ifdef CURLDIR
|
2005-11-13 10:46:13 +01:00
|
|
|
# This is still problematic -- gcc does not always want -R.
|
2005-11-05 08:50:09 +01:00
|
|
|
ALL_CFLAGS += -I$(CURLDIR)/include
|
2005-09-23 19:41:40 +02:00
|
|
|
CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl
|
|
|
|
|
else
|
|
|
|
|
CURL_LIBCURL = -lcurl
|
|
|
|
|
endif
|
2005-09-30 19:46:25 +02:00
|
|
|
PROGRAMS += git-http-fetch$X
|
2005-11-19 02:08:36 +01:00
|
|
|
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
|
|
|
|
|
ifeq "$(curl_check)" "070908"
|
|
|
|
|
ifndef NO_EXPAT
|
|
|
|
|
EXPAT_LIBEXPAT = -lexpat
|
|
|
|
|
PROGRAMS += git-http-push$X
|
|
|
|
|
endif
|
2005-11-02 20:19:24 +01:00
|
|
|
endif
|
2005-09-23 19:41:40 +02:00
|
|
|
endif
|
|
|
|
|
|
2005-07-29 17:50:51 +02:00
|
|
|
ifndef NO_OPENSSL
|
2005-09-08 02:26:23 +02:00
|
|
|
OPENSSL_LIBSSL = -lssl
|
2005-09-30 22:31:16 +02:00
|
|
|
ifdef OPENSSLDIR
|
|
|
|
|
# Again this may be problematic -- gcc does not always want -R.
|
2005-11-05 08:50:09 +01:00
|
|
|
ALL_CFLAGS += -I$(OPENSSLDIR)/include
|
2005-09-30 22:31:16 +02:00
|
|
|
OPENSSL_LINK = -L$(OPENSSLDIR)/lib -R$(OPENSSLDIR)/lib
|
|
|
|
|
else
|
|
|
|
|
OPENSSL_LINK =
|
|
|
|
|
endif
|
2005-07-29 17:50:51 +02:00
|
|
|
else
|
2005-11-05 08:50:09 +01:00
|
|
|
ALL_CFLAGS += -DNO_OPENSSL
|
2005-09-08 02:26:23 +02:00
|
|
|
MOZILLA_SHA1 = 1
|
|
|
|
|
OPENSSL_LIBSSL =
|
2005-07-29 17:50:51 +02:00
|
|
|
endif
|
2005-09-07 21:22:56 +02:00
|
|
|
ifdef NEEDS_SSL_WITH_CRYPTO
|
2005-09-30 22:31:16 +02:00
|
|
|
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl
|
2005-09-07 21:22:56 +02:00
|
|
|
else
|
2005-09-30 22:31:16 +02:00
|
|
|
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
|
2005-09-07 21:22:56 +02:00
|
|
|
endif
|
|
|
|
|
ifdef NEEDS_LIBICONV
|
2005-09-30 22:31:16 +02:00
|
|
|
ifdef ICONVDIR
|
|
|
|
|
# Again this may be problematic -- gcc does not always want -R.
|
2005-11-05 08:50:09 +01:00
|
|
|
ALL_CFLAGS += -I$(ICONVDIR)/include
|
2005-09-30 22:31:16 +02:00
|
|
|
ICONV_LINK = -L$(ICONVDIR)/lib -R$(ICONVDIR)/lib
|
|
|
|
|
else
|
|
|
|
|
ICONV_LINK =
|
|
|
|
|
endif
|
|
|
|
|
LIB_4_ICONV = $(ICONV_LINK) -liconv
|
2005-09-07 21:22:56 +02:00
|
|
|
else
|
|
|
|
|
LIB_4_ICONV =
|
|
|
|
|
endif
|
2005-09-06 01:24:03 +02:00
|
|
|
ifdef NEEDS_SOCKET
|
|
|
|
|
LIBS += -lsocket
|
|
|
|
|
SIMPLE_LIB += -lsocket
|
|
|
|
|
endif
|
2005-09-12 07:25:49 +02:00
|
|
|
ifdef NEEDS_NSL
|
|
|
|
|
LIBS += -lnsl
|
|
|
|
|
SIMPLE_LIB += -lnsl
|
|
|
|
|
endif
|
2006-01-20 02:13:57 +01:00
|
|
|
ifdef NO_D_TYPE_IN_DIRENT
|
|
|
|
|
ALL_CFLAGS += -DNO_D_TYPE_IN_DIRENT
|
|
|
|
|
endif
|
2006-01-20 02:13:51 +01:00
|
|
|
ifdef NO_D_INO_IN_DIRENT
|
|
|
|
|
ALL_CFLAGS += -DNO_D_INO_IN_DIRENT
|
|
|
|
|
endif
|
2005-09-19 03:30:50 +02:00
|
|
|
ifdef NO_STRCASESTR
|
2005-12-05 20:54:29 +01:00
|
|
|
COMPAT_CFLAGS += -DNO_STRCASESTR
|
2005-12-03 00:08:28 +01:00
|
|
|
COMPAT_OBJS += compat/strcasestr.o
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_SETENV
|
2005-12-05 20:54:29 +01:00
|
|
|
COMPAT_CFLAGS += -DNO_SETENV
|
2005-12-03 00:08:28 +01:00
|
|
|
COMPAT_OBJS += compat/setenv.o
|
2005-09-19 03:30:50 +02:00
|
|
|
endif
|
2006-01-25 21:38:36 +01:00
|
|
|
ifdef NO_SETENV
|
|
|
|
|
COMPAT_CFLAGS += -DNO_UNSETENV
|
|
|
|
|
COMPAT_OBJS += compat/unsetenv.o
|
|
|
|
|
endif
|
2005-10-09 00:54:36 +02:00
|
|
|
ifdef NO_MMAP
|
2005-12-05 20:54:29 +01:00
|
|
|
COMPAT_CFLAGS += -DNO_MMAP
|
2005-12-03 00:08:28 +01:00
|
|
|
COMPAT_OBJS += compat/mmap.o
|
2005-10-09 00:54:36 +02:00
|
|
|
endif
|
2005-09-29 01:52:21 +02:00
|
|
|
ifdef NO_IPV6
|
2006-01-20 02:13:32 +01:00
|
|
|
ALL_CFLAGS += -DNO_IPV6
|
|
|
|
|
endif
|
|
|
|
|
ifdef NO_SOCKADDR_STORAGE
|
|
|
|
|
ifdef NO_IPV6
|
|
|
|
|
ALL_CFLAGS += -Dsockaddr_storage=sockaddr_in
|
|
|
|
|
else
|
|
|
|
|
ALL_CFLAGS += -Dsockaddr_storage=sockaddr_in6
|
|
|
|
|
endif
|
2005-09-29 01:52:21 +02:00
|
|
|
endif
|
2005-04-21 21:33:22 +02:00
|
|
|
|
2006-02-16 09:38:01 +01:00
|
|
|
ifdef NO_ICONV
|
|
|
|
|
ALL_CFLAGS += -DNO_ICONV
|
|
|
|
|
endif
|
|
|
|
|
|
2005-09-20 18:27:13 +02:00
|
|
|
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>
|
|
|
|
|
LIBS += $(LIB_4_CRYPTO)
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
endif
|
2006-02-17 15:23:16 +01:00
|
|
|
ifdef NO_ACCURATE_DIFF
|
|
|
|
|
ALL_CFLAGS += -DNO_ACCURATE_DIFF
|
|
|
|
|
endif
|
2005-09-20 18:27:13 +02:00
|
|
|
|
2006-02-18 12:40:22 +01:00
|
|
|
# Shell quote (do not use $(call) to accomodate ancient setups);
|
|
|
|
|
|
|
|
|
|
SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
|
|
|
|
|
|
|
|
|
|
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
|
|
|
|
|
bindir_SQ = $(subst ','\'',$(bindir))
|
|
|
|
|
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
|
|
|
|
|
template_dir_SQ = $(subst ','\'',$(template_dir))
|
|
|
|
|
|
|
|
|
|
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
|
|
|
|
|
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
|
|
|
|
|
PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
|
|
|
|
|
GIT_PYTHON_DIR_SQ = $(subst ','\'',$(GIT_PYTHON_DIR))
|
|
|
|
|
|
|
|
|
|
ALL_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
|
2005-12-03 00:08:28 +01:00
|
|
|
LIB_OBJS += $(COMPAT_OBJS)
|
2005-10-12 03:47:33 +02:00
|
|
|
export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
|
2005-07-29 17:50:24 +02:00
|
|
|
### Build rules
|
|
|
|
|
|
2006-01-13 06:37:17 +01:00
|
|
|
all: $(ALL_PROGRAMS) git$X gitk
|
2005-04-30 22:19:56 +02:00
|
|
|
|
2005-08-06 21:50:14 +02:00
|
|
|
all:
|
|
|
|
|
$(MAKE) -C templates
|
2005-08-06 07:36:15 +02:00
|
|
|
|
2006-01-13 06:42:25 +01:00
|
|
|
strip: $(PROGRAMS) git$X
|
|
|
|
|
$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
|
|
|
|
|
|
2006-03-09 17:24:19 +01:00
|
|
|
git$X: git.c common-cmds.h $(LIB_FILE)
|
2006-01-11 03:12:17 +01:00
|
|
|
$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
|
2006-02-28 20:30:19 +01:00
|
|
|
$(ALL_CFLAGS) -o $@ $(filter %.c,$^) $(LIB_FILE) $(LIBS)
|
2005-09-08 06:26:52 +02:00
|
|
|
|
2006-03-09 17:24:19 +01:00
|
|
|
common-cmds.h: Documentation/git-*.txt
|
|
|
|
|
./generate-cmdlist.sh > $@
|
|
|
|
|
|
2005-11-22 00:44:15 +01:00
|
|
|
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
|
2005-09-09 03:50:33 +02:00
|
|
|
rm -f $@
|
2006-02-18 12:40:22 +01:00
|
|
|
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
2005-10-04 21:41:35 +02:00
|
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
2006-02-15 12:37:30 +01:00
|
|
|
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
|
2006-02-18 13:01:18 +01:00
|
|
|
-e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \
|
2005-10-04 21:41:35 +02:00
|
|
|
$@.sh >$@
|
2005-09-09 03:50:33 +02:00
|
|
|
chmod +x $@
|
|
|
|
|
|
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl
|
|
|
|
|
rm -f $@
|
2006-02-18 12:40:22 +01:00
|
|
|
sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
|
2005-10-04 21:41:35 +02:00
|
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
|
|
|
|
$@.perl >$@
|
2005-09-09 03:50:33 +02:00
|
|
|
chmod +x $@
|
|
|
|
|
|
2005-09-11 02:46:27 +02:00
|
|
|
$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
|
|
|
|
|
rm -f $@
|
2006-02-18 12:40:22 +01:00
|
|
|
sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
|
|
|
|
|
-e 's|@@GIT_PYTHON_PATH@@|$(GIT_PYTHON_DIR_SQ)|g' \
|
2005-10-04 21:41:35 +02:00
|
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
|
|
|
|
$@.py >$@
|
2005-09-11 02:46:27 +02:00
|
|
|
chmod +x $@
|
|
|
|
|
|
2005-10-20 17:13:24 +02:00
|
|
|
git-cherry-pick: git-revert
|
|
|
|
|
cp $< $@
|
|
|
|
|
|
2006-02-06 01:42:49 +01:00
|
|
|
git-show: git-whatchanged
|
|
|
|
|
cp $< $@
|
|
|
|
|
|
2006-02-10 09:45:59 +01:00
|
|
|
git-status: git-commit
|
|
|
|
|
cp $< $@
|
|
|
|
|
|
2005-12-27 23:40:17 +01:00
|
|
|
# These can record GIT_VERSION
|
|
|
|
|
git$X git.spec \
|
|
|
|
|
$(patsubst %.sh,%,$(SCRIPT_SH)) \
|
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
|
|
|
|
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
|
|
|
|
|
: GIT-VERSION-FILE
|
2005-12-22 20:38:23 +01:00
|
|
|
|
2005-08-06 07:36:15 +02:00
|
|
|
%.o: %.c
|
|
|
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
|
|
|
|
%.o: %.S
|
|
|
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
2005-05-19 16:27:14 +02:00
|
|
|
|
2006-02-18 12:40:22 +01:00
|
|
|
exec_cmd.o: exec_cmd.c
|
|
|
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' $<
|
2006-01-11 03:12:17 +01:00
|
|
|
|
2005-09-30 19:46:25 +02:00
|
|
|
git-%$X: %.o $(LIB_FILE)
|
2005-11-13 10:46:13 +01:00
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
|
2005-07-29 19:21:53 +02:00
|
|
|
|
2005-09-07 21:22:56 +02:00
|
|
|
$(SIMPLE_PROGRAMS) : $(LIB_FILE)
|
2005-09-30 19:46:25 +02:00
|
|
|
$(SIMPLE_PROGRAMS) : git-%$X : %.o
|
2005-11-13 10:46:13 +01:00
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
|
|
|
|
$(LIB_FILE) $(SIMPLE_LIB)
|
2005-09-07 21:22:56 +02:00
|
|
|
|
2006-02-18 12:40:22 +01:00
|
|
|
git-mailinfo$X: mailinfo.o $(LIB_FILE)
|
|
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
|
|
|
|
$(LIB_FILE) $(SIMPLE_LIB) $(LIB_4_ICONV)
|
|
|
|
|
|
2005-09-30 19:46:25 +02:00
|
|
|
git-local-fetch$X: fetch.o
|
|
|
|
|
git-ssh-fetch$X: rsh.o fetch.o
|
|
|
|
|
git-ssh-upload$X: rsh.o
|
|
|
|
|
git-ssh-pull$X: rsh.o fetch.o
|
|
|
|
|
git-ssh-push$X: rsh.o
|
2005-04-29 23:09:11 +02:00
|
|
|
|
2006-03-10 06:32:50 +01:00
|
|
|
git-imap-send$X: imap-send.o $(LIB_FILE)
|
|
|
|
|
|
2006-02-21 13:08:21 +01:00
|
|
|
git-http-fetch$X: fetch.o http.o http-fetch.o $(LIB_FILE)
|
2006-02-18 12:40:22 +01:00
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
|
|
|
|
$(LIBS) $(CURL_LIBCURL)
|
|
|
|
|
|
2006-03-08 01:13:20 +01:00
|
|
|
git-http-push$X: revision.o http.o http-push.o $(LIB_FILE)
|
2006-02-18 12:40:22 +01:00
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
|
|
|
|
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
|
|
|
|
|
|
2006-02-21 13:08:21 +01:00
|
|
|
git-rev-list$X: rev-list.o $(LIB_FILE)
|
2006-02-18 12:40:22 +01:00
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
|
|
|
|
$(LIBS) $(OPENSSL_LIBSSL)
|
2005-04-29 23:09:11 +02:00
|
|
|
|
2005-08-06 21:50:14 +02:00
|
|
|
init-db.o: init-db.c
|
2005-08-06 07:36:15 +02:00
|
|
|
$(CC) -c $(ALL_CFLAGS) \
|
2006-02-18 12:40:22 +01:00
|
|
|
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c
|
2005-08-06 21:50:14 +02:00
|
|
|
|
2005-07-29 17:48:50 +02:00
|
|
|
$(LIB_OBJS): $(LIB_H)
|
Use a *real* built-in diff generator
This uses a simplified libxdiff setup to generate unified diffs _without_
doing fork/execve of GNU "diff".
This has several huge advantages, for example:
Before:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m24.818s
user 0m13.332s
sys 0m8.664s
After:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m4.563s
user 0m2.944s
sys 0m1.580s
and the fact that this should be a lot more portable (ie we can ignore all
the issues with doing fork/execve under Windows).
Perhaps even more importantly, this allows us to do diffs without actually
ever writing out the git file contents to a temporary file (and without
any of the shell quoting issues on filenames etc etc).
NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
current "diff-core" code actually will always write the temp-files,
because it used to be something that you simply had to do. So this current
one actually writes a temp-file like before, and then reads it into memory
again just to do the diff. Stupid.
But if this basic infrastructure is accepted, we can start switching over
diff-core to not write temp-files, which should speed things up even
further, especially when doing big tree-to-tree diffs.
Now, in the interest of full disclosure, I should also point out a few
downsides:
- the libxdiff algorithm is different, and I bet GNU diff has gotten a
lot more testing. And the thing is, generating a diff is not an exact
science - you can get two different diffs (and you will), and they can
both be perfectly valid. So it's not possible to "validate" the
libxdiff output by just comparing it against GNU diff.
- GNU diff does some nice eye-candy, like trying to figure out what the
last function was, and adding that information to the "@@ .." line.
libxdiff doesn't do that.
- The libxdiff thing has some known deficiencies. In particular, it gets
the "\No newline at end of file" case wrong. So this is currently for
the experimental branch only. I hope Davide will help fix it.
That said, I think the huge performance advantage, and the fact that it
integrates better is definitely worth it. But it should go into a
development branch at least due to the missing newline issue.
Technical note: this is based on libxdiff-0.17, but I did some surgery to
get rid of the extraneous fat - stuff that git doesn't need, and seriously
cutting down on mmfile_t, which had much more capabilities than the diff
algorithm either needed or used. In this version, "mmfile_t" is just a
trivial <pointer,length> tuple.
That said, I tried to keep the differences to simple removals, so that you
can do a diff between this and the libxdiff origin, and you'll basically
see just things getting deleted. Even the mmfile_t simplifications are
left in a state where the diffs should be readable.
Apologies to Davide, whom I'd love to get feedback on this all from (I
wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
complex format had a helper function for that, but I did my surgery with
the goal in mind that eventually we _should_ just do
mmfile_t mf;
buf = read_sha1_file(sha1, type, &size);
mf->ptr = buf;
mf->size = size;
.. use "mf" directly ..
which was really a nightmare with the old "helpful" mmfile_t, and really
is that easy with the new cut-down interfaces).
[ Btw, as any hawk-eye can see from the diff, this was actually generated
with itself, so it is "self-hosting". That's about all the testing it
has gotten, along with the above kernel diff, which eye-balls correctly,
but shows the newline issue when you double-check it with "git-apply" ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-25 05:13:22 +01:00
|
|
|
$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIBS)
|
2005-07-29 17:48:50 +02:00
|
|
|
$(DIFF_OBJS): diffcore.h
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2005-07-29 17:50:24 +02:00
|
|
|
$(LIB_FILE): $(LIB_OBJS)
|
|
|
|
|
$(AR) rcs $@ $(LIB_OBJS)
|
|
|
|
|
|
Use a *real* built-in diff generator
This uses a simplified libxdiff setup to generate unified diffs _without_
doing fork/execve of GNU "diff".
This has several huge advantages, for example:
Before:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m24.818s
user 0m13.332s
sys 0m8.664s
After:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m4.563s
user 0m2.944s
sys 0m1.580s
and the fact that this should be a lot more portable (ie we can ignore all
the issues with doing fork/execve under Windows).
Perhaps even more importantly, this allows us to do diffs without actually
ever writing out the git file contents to a temporary file (and without
any of the shell quoting issues on filenames etc etc).
NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
current "diff-core" code actually will always write the temp-files,
because it used to be something that you simply had to do. So this current
one actually writes a temp-file like before, and then reads it into memory
again just to do the diff. Stupid.
But if this basic infrastructure is accepted, we can start switching over
diff-core to not write temp-files, which should speed things up even
further, especially when doing big tree-to-tree diffs.
Now, in the interest of full disclosure, I should also point out a few
downsides:
- the libxdiff algorithm is different, and I bet GNU diff has gotten a
lot more testing. And the thing is, generating a diff is not an exact
science - you can get two different diffs (and you will), and they can
both be perfectly valid. So it's not possible to "validate" the
libxdiff output by just comparing it against GNU diff.
- GNU diff does some nice eye-candy, like trying to figure out what the
last function was, and adding that information to the "@@ .." line.
libxdiff doesn't do that.
- The libxdiff thing has some known deficiencies. In particular, it gets
the "\No newline at end of file" case wrong. So this is currently for
the experimental branch only. I hope Davide will help fix it.
That said, I think the huge performance advantage, and the fact that it
integrates better is definitely worth it. But it should go into a
development branch at least due to the missing newline issue.
Technical note: this is based on libxdiff-0.17, but I did some surgery to
get rid of the extraneous fat - stuff that git doesn't need, and seriously
cutting down on mmfile_t, which had much more capabilities than the diff
algorithm either needed or used. In this version, "mmfile_t" is just a
trivial <pointer,length> tuple.
That said, I tried to keep the differences to simple removals, so that you
can do a diff between this and the libxdiff origin, and you'll basically
see just things getting deleted. Even the mmfile_t simplifications are
left in a state where the diffs should be readable.
Apologies to Davide, whom I'd love to get feedback on this all from (I
wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
complex format had a helper function for that, but I did my surgery with
the goal in mind that eventually we _should_ just do
mmfile_t mf;
buf = read_sha1_file(sha1, type, &size);
mf->ptr = buf;
mf->size = size;
.. use "mf" directly ..
which was really a nightmare with the old "helpful" mmfile_t, and really
is that easy with the new cut-down interfaces).
[ Btw, as any hawk-eye can see from the diff, this was actually generated
with itself, so it is "self-hosting". That's about all the testing it
has gotten, along with the above kernel diff, which eye-balls correctly,
but shows the newline issue when you double-check it with "git-apply" ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-25 05:13:22 +01:00
|
|
|
XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o
|
|
|
|
|
|
|
|
|
|
$(XDIFF_LIB): $(XDIFF_OBJS)
|
|
|
|
|
$(AR) rcs $@ $(XDIFF_OBJS)
|
|
|
|
|
|
|
|
|
|
|
2005-07-29 17:50:24 +02:00
|
|
|
doc:
|
|
|
|
|
$(MAKE) -C Documentation all
|
|
|
|
|
|
2006-03-18 11:07:12 +01:00
|
|
|
TAGS:
|
|
|
|
|
rm -f TAGS
|
|
|
|
|
find . -name '*.[hcS]' -print | xargs etags -a
|
|
|
|
|
|
|
|
|
|
tags:
|
|
|
|
|
rm -f tags
|
|
|
|
|
find . -name '*.[hcS]' -print | xargs ctags -a
|
2005-07-29 17:50:24 +02:00
|
|
|
|
|
|
|
|
### Testing rules
|
|
|
|
|
|
2006-02-18 13:01:18 +01:00
|
|
|
# GNU make supports exporting all variables by "export" without parameters.
|
|
|
|
|
# However, the environment gets quite big, and some programs have problems
|
|
|
|
|
# with that.
|
|
|
|
|
|
|
|
|
|
export NO_PYTHON
|
|
|
|
|
|
2005-07-29 17:50:24 +02:00
|
|
|
test: all
|
|
|
|
|
$(MAKE) -C t/ all
|
|
|
|
|
|
2005-11-02 21:01:06 +01:00
|
|
|
test-date$X: test-date.c date.o ctype.o
|
2005-11-13 10:46:13 +01:00
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) test-date.c date.o ctype.o
|
2005-07-29 17:50:24 +02:00
|
|
|
|
2005-09-30 19:46:25 +02:00
|
|
|
test-delta$X: test-delta.c diff-delta.o patch-delta.o
|
2006-03-08 19:19:19 +01:00
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ -lz
|
2005-07-29 17:50:24 +02:00
|
|
|
|
|
|
|
|
check:
|
2005-12-14 22:32:52 +01:00
|
|
|
for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
|
2005-07-29 17:50:24 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### Installation rules
|
|
|
|
|
|
2005-11-22 00:44:15 +01:00
|
|
|
install: all
|
2006-02-18 12:40:22 +01:00
|
|
|
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(bindir_SQ)'
|
|
|
|
|
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
|
|
|
|
|
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
|
|
|
|
|
$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
|
2005-08-03 01:45:21 +02:00
|
|
|
$(MAKE) -C templates install
|
2006-02-18 12:40:22 +01:00
|
|
|
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
|
|
|
|
|
$(INSTALL) $(PYMODULES) '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
|
2005-07-29 17:50:24 +02:00
|
|
|
|
|
|
|
|
install-doc:
|
|
|
|
|
$(MAKE) -C Documentation install
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### Maintainer's dist rules
|
|
|
|
|
|
2005-12-27 23:40:17 +01:00
|
|
|
git.spec: git.spec.in
|
2005-07-07 22:09:50 +02:00
|
|
|
sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@
|
|
|
|
|
|
2005-11-17 06:32:44 +01:00
|
|
|
GIT_TARNAME=git-$(GIT_VERSION)
|
|
|
|
|
dist: git.spec git-tar-tree
|
2005-07-11 23:03:09 +02:00
|
|
|
./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar
|
2005-07-07 22:09:50 +02:00
|
|
|
@mkdir -p $(GIT_TARNAME)
|
2005-11-17 06:32:44 +01:00
|
|
|
@cp git.spec $(GIT_TARNAME)
|
2006-01-10 03:07:01 +01:00
|
|
|
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
|
|
|
|
|
$(TAR) rf $(GIT_TARNAME).tar \
|
|
|
|
|
$(GIT_TARNAME)/git.spec $(GIT_TARNAME)/version
|
2005-07-07 22:09:50 +02:00
|
|
|
@rm -rf $(GIT_TARNAME)
|
2005-07-15 03:20:50 +02:00
|
|
|
gzip -f -9 $(GIT_TARNAME).tar
|
2005-07-07 22:09:50 +02:00
|
|
|
|
|
|
|
|
rpm: dist
|
2005-11-17 06:32:44 +01:00
|
|
|
$(RPMBUILD) -ta $(GIT_TARNAME).tar.gz
|
2005-07-07 22:09:50 +02:00
|
|
|
|
2005-07-29 17:50:24 +02:00
|
|
|
### Cleaning rules
|
2005-07-15 03:21:57 +02:00
|
|
|
|
2005-04-08 00:13:13 +02:00
|
|
|
clean:
|
2005-11-22 07:52:37 +01:00
|
|
|
rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o $(LIB_FILE)
|
2006-01-13 06:37:17 +01:00
|
|
|
rm -f $(ALL_PROGRAMS) git$X
|
2006-03-18 11:07:12 +01:00
|
|
|
rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
|
2005-08-07 07:29:21 +02:00
|
|
|
rm -rf $(GIT_TARNAME)
|
2005-08-12 10:03:07 +02:00
|
|
|
rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
|
2005-05-22 20:27:28 +02:00
|
|
|
$(MAKE) -C Documentation/ clean
|
2005-09-23 19:41:40 +02:00
|
|
|
$(MAKE) -C templates clean
|
2005-08-03 02:24:11 +02:00
|
|
|
$(MAKE) -C t/ clean
|
2005-12-27 23:40:17 +01:00
|
|
|
rm -f GIT-VERSION-FILE
|
|
|
|
|
|
2006-01-13 06:42:25 +01:00
|
|
|
.PHONY: all install clean strip
|
2006-03-18 11:07:12 +01:00
|
|
|
.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags
|
2005-12-20 02:59:58 +01:00
|
|
|
|