aboutsummaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAge
* 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>
| * C implementation of the 'git' program, take two.Andreas Ericsson2005-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch provides a C implementation of the 'git' program and introduces support for putting the git-* commands in a directory of their own. It also saves some time on executing those commands in a tight loop and it prints the currently available git commands in a nicely formatted list. The location of the GIT_EXEC_PATH (name discussion's closed, thank gods) can be obtained by running git --exec-path which will hopefully give porcelainistas ample time to adapt their heavy-duty loops to call the core programs directly and thus save the extra fork() / execve() overhead, although that's not really necessary any more. The --exec-path value is prepended to $PATH, so the git-* programs should Just Work without ever requiring any changes to how they call other programs in the suite. Some timing values for 10000 invocations of git-var >&/dev/null: git.sh: 24.194s git.c: 9.044s git-var: 7.377s The git-<tab><tab> behaviour can, along with the someday-to-be-deprecated git-<command> form of invocation, be indefinitely retained by adding the following line to one's .bash_profile or equivalent: PATH=$PATH:$(git --exec-path) Experimental libraries can be used by either setting the environment variable GIT_EXEC_PATH, or by using git --exec-path=/some/experimental/exec-path Relative paths are properly grok'ed as exec-path values. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * diff: make default rename detection limit configurable.Junio C Hamano2005-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A while ago, a rename-detection limit logic was implemented as a response to this thread: http://marc.theaimsgroup.com/?l=git&m=112413080630175 where gitweb was found to be using a lot of time and memory to detect renames on huge commits. git-diff family takes -l<num> flag, and if the number of paths that are rename destination candidates (i.e. new paths with -M, or modified paths with -C) are larger than that number, skips rename/copy detection even when -M or -C is specified on the command line. This commit makes the rename detection limit easier to use. You can have: [diff] renamelimit = 30 in your .git/config file to specify the default rename detection limit. You can override this from the command line; giving 0 means 'unlimited': git diff -M -l0 We might want to change the default behaviour, when you do not have the configuration, to limit it to say 20 paths or so. This would also help the diffstat generation after a big 'git pull'. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-core-foo -> git-foo, except the core packageH. Peter Anvin2005-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch renames the tarball "git" rather than "git-core", and changes the names of various packages from git-core-foo to git-foo. git-core is still the true core package; an empty RPM package named "git" pulls in ALL the git packages -- this makes updates work correctly, and allows "yum install git" to do the obvious thing. It also renames the git-(core-)tk package to gitk. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 0.99.9j aka 1.0rc3v1.0rc3v0.99.9jJunio C Hamano2005-11-16
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 0.99.9i aka 1.0rc2v1.0rc2v0.99.9iJunio C Hamano2005-11-14
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Remove git-rename. git-mv does the sameJosef Weidendorfer2005-11-14
| | | | | | | | | | Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Separate LDFLAGS and CFLAGS.Junio C Hamano2005-11-14
| | | | | | | | | | | | | | | | Stuffing -L flag and friends meant for the linking phase into ALL_CFLAGS is not right; honor LDFLAGS and introduce ALL_LDFLAGS to separate them out. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Rename lost+found to lost-found.Junio C Hamano2005-11-13
| | | | | | | | | | | | | | | | Because we use "lost-found" as the directory name to hold dangling object names, it is confusing to call the command git-lost+found, although it makes sense and is even cute ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 0.99.9hv1.0rc1v0.99.9hJunio C Hamano2005-11-11
|\ \ | |/ | | | | | | | | | | | | This is GIT 1.0-rc1 in disguise. It is plausible that relatively new parts of the system still need tweaking and fixing, but that is why it is not 1.0 but rc ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-lost+foundJunio C Hamano2005-11-11
| | | | | | | | | | | | This command helps you resurrect accidentally lost tags and commits. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Rename git-pack-intersect to git-pack-redundantLukas_Sandström2005-11-11
| | | | | | | | | | | | | | | | | | | | | | This patch renames git-pack-intersect to git-pack-redundant as suggested by Petr Baudis. The new name reflects what the program does, rather than how it does it. Also fix a small argument parsing bug. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Add git-pack-intersectLukas_Sandström2005-11-11
| | | | | | | | | | | | | | | | This patch adds the program git-pack-intersect. It is used to find redundant packs in git repositories. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 0.99.9gv0.99.9gJunio C Hamano2005-11-09
|\ \ | |/ | | | | | | | | | | | | | | | | | | Another snapshot, as slow and steady marth towards 1.0 continues. Major changes include: - Jim Radford's RPM split. - Fredrik's recursive merge strategy is now default for two heads merge. - Yaacov's SVN importer updates. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 0.99.9fv0.99.9fJunio C Hamano2005-11-08
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'master'Junio C Hamano2005-11-07
|\ \ | |/
| * Introducing: git-cvsexportcommitMartin Langhoff2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A script that can replay commits git into a CVS checkout. Tries to ensure the sanity of the operation and supports mainly manual usage. If you are reckless enough, you can ask it to autocommit when everything has applied cleanly. Combined with a couple more scripts could become part of a git2cvs gateway. Should support adds/removes and binary files. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
| |
| \
*-. \ GIT 0.99.9ev0.99.9eJunio C Hamano2005-11-06
|\ \ \ | | |/ | |/| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * GIT v0.99.7dv0.99.7dJunio C Hamano2005-09-25
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-10 10:29:03 +0000