aboutsummaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAge
* Run GIT-VERSION-GEN with $(SHELL), not sh.Jason Riedy2006-01-25
| | | | | | | | Alas, not all shells named sh are capable enough to run GIT-VERSION-GEN. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* DT_UNKNOWN: do not fully trust existence of DT_UNKNOWNJunio C Hamano2006-01-21
| | | | | | | | The recent Cygwin defines DT_UNKNOWN although it does not have d_type in struct dirent. Give an option to tell us not to use d_type on such platforms. Hopefully this problem will be transient. Signed-off-by: Junio C Hamano <junkio@cox.net>
* fsck-objects: support platforms without d_ino in struct dirent.Junio C Hamano2006-01-21
| | | | | | | | | | | | | The d_ino field is only used for performance reasons in fsck-objects. On a typical filesystem, i-number tends to have a strong correlation with where the actual bits sit on the disk platter, and we sort the entries to allow us scan things that ought to be close together together. If the platform lacks support for it, it is not a big deal. Just do not use d_ino for sorting, and scan them unsorted. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Makefile: do not assume lack of IPV6 means no sockaddr_storage.Junio C Hamano2006-01-21
| | | | | | | Noticed first by Alex, that the latest Cygwin now properly has sockaddr_storage. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Disable USE_SYMLINK_HEAD by defaultPavel Roskin2006-01-19
| | | | | | | | | | | Disable USE_SYMLINK_HEAD by default. Recommend using it only for compatibility with older software. Treat USE_SYMLINK_HEAD like other optional defines - check whether it's defined, not its value. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix the installation location.Junio C Hamano2006-01-13
| | | | | | | | | | | The earlier change to separate $(gitexecdir) from $(bindir) had the installation location of the git wrapper and the rest of the commands the wrong way (right now, both of them point at the same location so there is no real harm). Also gitk needs to be installed in $(bindir). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Exec git programs without using PATH.Michal Ostrowski2006-01-13
| | | | | | | | | | | | | | | | | | | | | | | | | The git suite may not be in PATH (and thus programs such as git-send-pack could not exec git-rev-list). Thus there is a need for logic that will locate these programs. Modifying PATH is not desirable as it result in behavior differing from the user's intentions, as we may end up prepending "/usr/bin" to PATH. - git C programs will use exec*_git_cmd() APIs to exec sub-commands. - exec*_git_cmd() will execute a git program by searching for it in the following directories: 1. --exec-path (as used by "git") 2. The GIT_EXEC_PATH environment variable. 3. $(gitexecdir) as set in Makefile (default value $(bindir)). - git wrapper will modify PATH as before to enable shell scripts to invoke "git-foo" commands. Ideally, shell scripts should use the git wrapper to become independent of PATH, and then modifying PATH will not be necessary. [jc: with minor updates after a brief review.] Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Makefile: add 'strip' targetJunio C Hamano2006-01-12
| | | | | | | | This is not invoked by any other target (most notably, "make install" does not), but is provided as a convenience for people who are building from the source. Signed-off-by: Junio C Hamano <junkio@cox.net>
* For release tarballs, include the proper versionH. Peter Anvin2006-01-09
| | | | | | | | | When producing a release tarball, include a "version" file, which GIT-VERSION-GEN can then use to do the right thing when building from a tarball. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.1.0v1.1.0Junio C Hamano2006-01-08
|\
| * GIT 1.0.8v1.0.8Junio C Hamano2006-01-07
| |\
| | * Retire debian/ directory.Junio C Hamano2006-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The official maintainer is keeping up-to-date quite well, and now the older Debian is supported with backports.org, there is no reason for me to keep debian/ directory around here. I have not been building and publishing debs since 1.0.4 anyway. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | GIT 1.0.7v1.0.7Junio C Hamano2006-01-05
| |\ \ | | |/ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | GIT 1.0.6v1.0.6Junio C Hamano2005-12-27
| |\ \ | | |/ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | GIT 1.0.5v1.0.5Junio C Hamano2005-12-26
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor fixes. Starting from this one I won't be touching debian/ directory since the official maintainer seems to be reasonably quick to package up things. The packaging procedure used there seems to be quite different from what I have, so I'd like to avoid potential confusion and reduce work by the official maintainer and myself. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | GIT 1.0.4v1.0.4Junio C Hamano2005-12-24
| |\ \ | | |/ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Makefile: use git-describe to mark the git version.Junio C Hamano2005-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: with this commit, the GIT maintainer workflow must change. GIT-VERSION-GEN is now the file to munge when the default version needs to be changed, not Makefile. The tag needs to be pushed into the repository to build the official tarball and binary package beforehand. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add a "git-describe" commandLinus Torvalds2005-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge in fixes up to 1.0.3 maintenance branch.Junio C Hamano2005-12-22
|\ \ \ | |/ / | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | GIT 1.0.3v1.0.3Junio C Hamano2005-12-22
| |\ \ | | |/ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * git-format-patch should show the correct versionJohannes Schindelin2005-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | We want to record the version of the tools the patch was generated with. While these tools could be rebuilt, git-format-patch stayed the same and report the wrong version. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | GIT 1.0.0bv1.0.2v1.0.0bJunio C Hamano2005-12-21
| |\ \ | | |/ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | GIT 1.0.0av1.0.1v1.0.0aJunio C Hamano2005-12-21
| |/ | | | | | | | | | | | | | | | | - Avoid misleading success message on error (Johannes) - objects/info/packs: work around bug in http-fetch.c::fetch_indices() - http-fetch.c: fix objects/info/pack parsing. - An off-by-one bug found by valgrind (Pavel) Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Versioning scheme changes.Junio C Hamano2005-12-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HPA suggests it is simply silly to imitate Linux versioning scheme where the leading "2" does not mean anything anymore, and I tend to agree. The first feature release after 1.0.0 will be 1.1.0, and the development path leading to 1.1.0 will carry 1.0.GIT as the version number from now on. Similarly, the third maintenance release that follows 1.0.0 will not be 1.0.0c as planned, but will be called 1.0.3. The "maint" branch will merge in fixes and immediately tagged, so there is no need for 1.0.2.GIT that is in between 1.0.2 (aka 1.0.0b) and 1.0.3. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Post 1.0.0 development track.Junio C Hamano2005-12-21
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.0.0v1.0.0Junio C Hamano2005-12-21
|\ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Remove "octopus".Junio C Hamano2005-12-19
| | | | | | | | | | | | | | | | | | We still advertise "git resolve" as a standalone command, but never "git octopus", so nobody should be using it and it is safe to retire it. The functionality is still available as a strategy backend. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Remove generated files */*.py[co]Junio C Hamano2005-12-19
| | | | | | | | | | | | We missed ones in the compat/ subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * fetch-pack: -k option to keep downloaded pack.Junio C Hamano2005-12-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Split out the functions that deal with the socketpair after finishing git protocol handshake to receive the packed data into a separate file, and use it in fetch-pack to keep/explode the received pack data. We earlier had something like that on clone-pack side once, but the list discussion resulted in the decision that it makes sense to always keep the pack for clone-pack, so unpacking option is not enabled on the clone-pack side, but we later still could do so easily if we wanted to with this change. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 0.99.9n aka 1.0rc6v1.0rc6v0.99.9nJunio C Hamano2005-12-14
|\ \ | |/ | | | | | | | | | | | | | | | | | | Oh, I hate to do this but I ended up merging big usage string cleanups from Fredrik, git-am enhancements that made a lot of sense for non mbox users from HPA, and rebase changes (done independently by me and Lukas) among other things, so git is still in perpetual state of 1.0rc. 1.0 will probably be next Wednesday, but who knows. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Do not let errors pass by unnoticed when running `make check'.Junio C Hamano2005-12-14
| | | | | | | | | | | | [jc: originally from Amos Waterland.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 0.99.9m aka 1.0rc5v1.0rc5v0.99.9mJunio C Hamano2005-12-11
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Initial AIX portability fixes.Jason Riedy2005-12-06
| | | | | | | | | | | | | | | | | | | | | | Added an AIX clause in the Makefile; that clause likely will be wrong for any AIX pre-5.2, but I can only test on 5.3. mailinfo.c was missing the compat header file, and convert-objects.c needs to define a specific _XOPEN_SOURCE as well as _XOPEN_SOURCE_EXTENDED. Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Clean up compatibility definitions.Junio C Hamano2005-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This attempts to clean up the way various compatibility functions are defined and used. - A new header file, git-compat-util.h, is introduced. This looks at various NO_XXX and does necessary function name replacements, equivalent of -Dstrcasestr=gitstrcasestr in the Makefile. - Those function name replacements are removed from the Makefile. - Common features such as usage(), die(), xmalloc() are moved from cache.h to git-compat-util.h; cache.h includes git-compat-util.h itself. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 0.99.9l aka 1.0rc4v1.0rc4v0.99.9lJunio C Hamano2005-12-03
|\ \ | |/
| * Add compat/setenv.c, use in git.c.Jason Riedy2005-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no setenv() in Solaris 5.8. The trivial calls to setenv() were replaced by putenv() in a much earlier patch, but setenv() was used again in git.c. This patch just adds a compat/setenv.c. The rule for building git$(X) also needs to include compat. objects and compiler flags. Those are now in makefile vars COMPAT_OBJS and COMPAT_CFLAGS. Signed-off-by: E. Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Makefile: say the default target upfront.Junio C Hamano2005-12-01
| | | | | | | | | | | | | | | | Alex Riesen wants to keep extra makefile targets in config.mak, but the file is included before any of our real targets. Having this at the beginning allows you to do so. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Move couple of ifdefs after "include config.mk"Timo Hirvonen2005-11-30
| | | | | | | | | | | | | | | | This makes it possible to define WITH_SEND_EMAIL etc. in config.mak. Also remove GIT_LIST_TWEAK because it isn't used anymore. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 0.99.9kv0.99.9kJunio C Hamano2005-11-25
|\ \ | |/ | | | | | | | | This is not 1.0rc4 yet, but to push the recent fixes out. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Rename git-config-set to git-repo-configJohannes Schindelin2005-11-24
| | | | | | | | | | | | | | ... and adjust all references. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Move diff.renamelimit out of default configuration.Junio C Hamano2005-11-21
| | | | | | | | | | | | | | Otherwise we would end up linking all the unneeded stuff into git-daemon only to link with git_default_config. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Introduce $(ALL_PROGRAMS) for 'all:' and 'install:' to operate on.Andreas Ericsson2005-11-21
| | | | | | | | | | | | | | | | | | | | Remove $(SIMPLE_PROGRAMS) from $(PROGRAMS) so buildrules don't have to be overridden. Put $(SCRIPTS) with the other target-macros so it doesn't get lonely. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Add Python version checks to the Makefile to automatically set ↵Ryan Anderson2005-11-20
| | | | | | | | | | | | | | | | | | WITH_OWN_SUBPROCESS_PY Also rearrange some path settings in the Makefile in the process. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Add git-config-set, a simple helper for scripts to set config variablesJohannes Schindelin2005-11-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is meant for the end user, who cannot be expected to edit .git/config by hand. Example: git-config-set core.filemode true will set filemode in the section [core] to true, git-config-set --unset core.filemode will remove the entry (failing if it is not there), and git-config-set --unset diff.twohead ^recar will remove the unique entry whose value matches the regex "^recar" (failing if there is no unique such entry). It is just a light wrapper around git_config_set() and git_config_set_multivar(). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Decide whether to build http-push in the MakefileNick Hengeveld2005-11-19
| | | | | | | | | | | | | | | | | | The decision about whether to build http-push or not belongs in the Makefile. This follows Junio's suggestion to determine whether curl is new enough to support http-push. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Isolate shared HTTP request functionalityNick Hengeveld2005-11-19
| | | | | | | | | | | | | | | | | | | | | | | | Move shared HTTP request functionality out of http-fetch and http-push, and replace the two fwrite_buffer/fwrite_buffer_dynamic functions with one fwrite_buffer function that does dynamic buffering. Use slot callbacks to process responses to fetch object transfer requests and push transfer requests, and put all of http-push into an #ifdef check for curl multi support. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'master'Junio C Hamano2005-11-18
|\ \ | |/
| * Cygwin *might* be helped with NO_MMAPJunio C Hamano2005-11-18
| | | | | | | | | | | | | | | | | | When HPA added Cygwin target, it ran just fine without NO_MMAP for him, but recently we are getting reports that for some people things break without it. For now, just suggest it in the Makefile without actually updating the default. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'master'Junio C Hamano2005-11-18
|\ \ | |/
| * 'make clean' forgot about some filesNicolas Pitre2005-11-17
| | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>