| 49f582a | Jakub Narebski | 21 June 2006, 15:06:39 UTC | gitweb: Make use of $PATH_INFO for project parameter Allow to have project name in the path part of URL, just after the name of script. For example instead of gitweb.cgi?p=git.git you can write gitweb.cgi/git.git or gitweb.cgi/git.git/ Not used in URLs inside gitweb; it means that the above alternate syntax must be generated by hand, at least for now. Side effect: project name parameter is now stripped of leading and trailing slash before validation. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 21:01:15 UTC |
| 5fdc849 | Linus Torvalds | 21 June 2006, 18:01:12 UTC | Fix grow_refs_hash() Earlier commit 3e4339e6f96e8c4f38a9c6607b98d3e96a2ed783 had a thinko that did not check for collisions while repopulating the objects in the new hash table. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 19:39:39 UTC |
| 160a59f | Junio C Hamano | 21 June 2006, 10:56:41 UTC | Merge branch 'ew/rebase' into next * ew/rebase: rebase: error out for NO_PYTHON if they use recursive merge Add renaming-rebase test. rebase: Allow merge strategies to be used when rebasing object-refs: avoid division by zero | 21 June 2006, 10:56:41 UTC |
| 693c15d | Eric Wong | 21 June 2006, 10:04:42 UTC | rebase: error out for NO_PYTHON if they use recursive merge recursive merge relies on Python, and we can't perform rename-aware merges without the recursive merge. So bail out before trying it. The test won't work w/o recursive merge, either, so skip that, too. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 10:56:30 UTC |
| c3fb0e3 | Junio C Hamano | 18 June 2006, 10:33:12 UTC | Add renaming-rebase test. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 10:56:29 UTC |
| 58634db | Eric Wong | 21 June 2006, 10:04:41 UTC | rebase: Allow merge strategies to be used when rebasing This solves the problem of rebasing local commits against an upstream that has renamed files. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 10:56:29 UTC |
| 86f660b | Andre Noll | 21 June 2006, 02:46:05 UTC | object-refs: avoid division by zero Currently, we don't check refs_hash_size size and happily call lookup_object_refs() even if refs_hash_size is zero which leads to a division by zero in hash_obj(). Signed-off-by: Andre Noll <maan@systemlinux.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 10:56:00 UTC |
| 9d24ed4 | Junio C Hamano | 21 June 2006, 10:51:59 UTC | Merge branch 'ff/c99' into next * ff/c99: Remove all void-pointer arithmetic. | 21 June 2006, 10:51:59 UTC |
| 3bec0da | Junio C Hamano | 21 June 2006, 09:50:59 UTC | Merge branch 'jc/upload-corrupt' into next * jc/upload-corrupt: upload-pack/fetch-pack: support side-band communication Retire git-clone-pack upload-pack: prepare for sideband message support. upload-pack: avoid sending an incomplete pack upon failure Fix possible out-of-bounds array access | 21 June 2006, 09:50:59 UTC |
| 583b7ea | Junio C Hamano | 21 June 2006, 07:30:21 UTC | upload-pack/fetch-pack: support side-band communication This implements a protocol extension between fetch-pack and upload-pack to allow stderr stream from upload-pack (primarily used for the progress bar display) to be passed back. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 09:50:32 UTC |
| efc7fa5 | Junio C Hamano | 21 June 2006, 06:54:26 UTC | Retire git-clone-pack The program is not used by git-clone since git-fetch-pack was extended to allow its caller do what git-clone-pack alone did, and git-clone was updated to use it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 09:34:14 UTC |
| 363b781 | Junio C Hamano | 21 June 2006, 05:48:23 UTC | upload-pack: prepare for sideband message support. This does not implement sideband for propagating the status to the downloader yet, but add code to capture the standard error output from the pack-objects process in preparation for sending it off to the client when the protocol extension allows us to do so. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 09:34:14 UTC |
| b1c71b7 | Junio C Hamano | 21 June 2006, 01:26:34 UTC | upload-pack: avoid sending an incomplete pack upon failure When the repository on the remote side is corrupted, rev-list spawned from upload-pack would die with error, but pack-objects that reads from the rev-list happily created a packfile that can be unpacked by the downloader. When this happens, the resulting packfile is not corrupted and unpacks cleanly, but the list of the objects contained in it is not what the protocol exchange computed. This update makes upload-pack to monitor its subprocesses, and when either of them dies with error, sends an incomplete pack data to the downloader to cause it to fail. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 09:34:14 UTC |
| 4840122 | Junio C Hamano | 21 June 2006, 09:33:43 UTC | Merge branch 'jn/web' into next * jn/web: Move $gitbin earlier in gitweb.cgi Add git version to gitweb output gitweb: whitespace cleanup | 21 June 2006, 09:33:43 UTC |
| bb9e15a | Uwe Zeisberger | 21 June 2006, 09:04:12 UTC | Fix possible out-of-bounds array access If match is "", match[-1] is accessed. Let pathspec_matches return 1 in that case indicating that "" matches everything. Incidently this fixes git-grep'ing in ".". Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 09:30:46 UTC |
| 3f7f271 | Jakub Narebski | 21 June 2006, 07:48:04 UTC | Move $gitbin earlier in gitweb.cgi (cherry picked from 9dca843086356b964f27d8fabe1e3c48074a9f02 commit) Signed-off-by: Jakub Narebski <jnareb.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 09:02:01 UTC |
| ae20de5 | Jakub Narebski | 21 June 2006, 07:48:03 UTC | Add git version to gitweb output Add git-core binaries used version as the comment at the beginning of HTML output, just below the comment with version of git web interface version. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 09:02:01 UTC |
| 7a9b4c5 | Jakub Narebski | 21 June 2006, 07:48:02 UTC | gitweb: whitespace cleanup Do not use tabs to align variable initialization (actually use tabs only at the beginning of line, for code indent). Remove trailing whitespace. Make whitespace usage more consistent. Signed-off-by: Jakub Narebski <jnareb.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 09:02:00 UTC |
| ad9f72a | Junio C Hamano | 21 June 2006, 08:24:45 UTC | Merge branch 'master' into next * master: checkout -f: do not leave untracked working tree files. Log peer address when git-daemon called from inetd | 21 June 2006, 08:24:45 UTC |
| 4170af8 | Junio C Hamano | 20 June 2006, 09:47:14 UTC | checkout -f: do not leave untracked working tree files. Earlier we did not consider untracked working tree files "precious", but we have always considered them fair game to clobber. These days, branch switching by read-tree is more careful and tries to protect untracked working tree files. This caused the following workflow to stop working: git checkout one-branch-with-file-F git checkout -f another-without-file-F git pull . one-branch-with-file-F Because the second checkout leaves F from the previous state as untracked file in the working tree, the merge would fail, trying to protect F from being clobbered. This changes "git checkout -f" to remove working tree files that are known to git in the switched-from state but do not exist in the switched-to state, borrowing the same logic from "reset --hard". Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 05:21:11 UTC |
| 5b276ee | David Woodhouse | 20 June 2006, 14:38:13 UTC | Log peer address when git-daemon called from inetd When we run git-daemon from inetd, even with the --verbose option, it doesn't log the peer address. That logic was only in the standalone daemon code -- move it to the execute() function instead. Tested with both IPv6 and Legacy IP clients, in both inetd and daemon mode. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 June 2006, 05:19:29 UTC |
| 69d830d | Junio C Hamano | 20 June 2006, 21:06:32 UTC | Merge branch 'jn/web' into next * jn/web: gitweb: style done with stylesheet gitweb: A couple of page title tweaking | 20 June 2006, 21:06:32 UTC |
| 1f1ab5f | Jakub Narebski | 20 June 2006, 14:58:12 UTC | gitweb: style done with stylesheet Replace (almost) all 'style' attributes with 'class' attribute and adding rule to CSS file. Some tables use CSS for styling instead of legacy styling attributes. [jc: too many rejects -- hand fixed and reindented] | 20 June 2006, 21:01:13 UTC |
| 7bedd9f | Jakub Narebski | 20 June 2006, 06:17:03 UTC | gitweb: A couple of page title tweaking [jc: the e-mailed patch did not apply, so I had to guess but I think I got the result right.] | 20 June 2006, 20:46:30 UTC |
| 02ca920 | Junio C Hamano | 20 June 2006, 10:00:13 UTC | Merge branch 'jn/web' into next | 20 June 2006, 10:00:13 UTC |
| 57bd4d3 | Jakub Narebski | 20 June 2006, 06:19:31 UTC | Fix: Support for the standard mime.types map in gitweb Temporary fix: commented out offending line in mimetype_guess. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 09:59:55 UTC |
| 753fa21 | Junio C Hamano | 20 June 2006, 09:51:23 UTC | Merge branch 'master' into next | 20 June 2006, 09:51:23 UTC |
| a796b89 | Junio C Hamano | 20 June 2006, 09:39:53 UTC | Merge branch 'jn/web' into next | 20 June 2006, 09:39:53 UTC |
| 9e37f72 | Junio C Hamano | 20 June 2006, 09:39:48 UTC | Merge branch 'pb/config' into next | 20 June 2006, 09:39:48 UTC |
| 1d7f171 | Florian Forster | 18 June 2006, 15:18:09 UTC | Remove all void-pointer arithmetic. ANSI C99 doesn't allow void-pointer arithmetic. This patch fixes this in various ways. Usually the strategy that required the least changes was used. Signed-off-by: Florian Forster <octo@verplant.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 08:59:46 UTC |
| c07eee1 | Eric Wong | 20 June 2006, 00:59:35 UTC | git-svn: fix --rmdir when using SVN:: libraries When tracking directories with nearly all of its files at the most nested levels, --rmdir would accidentally go too far when deleting. Of course, we'll add a test for this condition, too. Makefile: automatically run new tests as they appear in t/ Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 08:31:57 UTC |
| e33d061 | Johannes Schindelin | 20 June 2006, 07:51:09 UTC | git_config: access() returns 0 on success, not > 0 Another late-night bug. Sorry again. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 08:21:53 UTC |
| 92a28be | Johannes Schindelin | 20 June 2006, 07:45:53 UTC | repo-config: Fix late-night bug This bug was hidden by the "future-proofing" of the test. Sigh. When neither GIT_CONFIG nor GIT_CONFIG_LOCAL is set, do not use NULL, but $GIT_DIR/config. Instead of using $GIT_DIR/config when only GIT_CONFIG_LOCAL is set. Sorry. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 08:21:51 UTC |
| 7b6511a | Jakub Narebski | 20 June 2006, 04:11:32 UTC | gitweb: add type="text/css" to stylesheet link Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 04:16:09 UTC |
| 592689c | Junio C Hamano | 20 June 2006, 01:47:51 UTC | Merge branch 'jc/waitpid' into next * jc/waitpid: Restore SIGCHLD to SIG_DFL where we care about waitpid(). | 20 June 2006, 01:47:51 UTC |
| b19beec | Junio C Hamano | 20 June 2006, 01:47:29 UTC | Merge branch 'lt/objlist' into next * lt/objlist: Add "named object array" concept xdiff: minor changes to match libxdiff-0.21 fix rfc2047 formatter. Fix t8001-annotate and t8002-blame for ActiveState Perl Add specialized object allocator | 20 June 2006, 01:47:29 UTC |
| 474bc4e | Junio C Hamano | 20 June 2006, 01:46:56 UTC | Merge branches 'js/lsfix', 'pb/config' and 'jn/web' into next * js/lsfix: Initialize lock_file struct to all zero. * pb/config: Read configuration also from $HOME/.gitconfig Fix setting config variables with an alternative GIT_CONFIG * jn/web: Make CSS file gitweb/gitweb.css more readable | 20 June 2006, 01:46:56 UTC |
| 1f1e895 | Linus Torvalds | 20 June 2006, 00:42:35 UTC | Add "named object array" concept We've had this notion of a "object_list" for a long time, which eventually grew a "name" member because some users (notably git-rev-list) wanted to name each object as it is generated. That object_list is great for some things, but it isn't all that wonderful for others, and the "name" member is generally not used by everybody. This patch splits the users of the object_list array up into two: the traditional list users, who want the list-like format, and who don't actually use or want the name. And another class of users that really used the list as an extensible array, and generally wanted to name the objects. The patch is fairly straightforward, but it's also biggish. Most of it really just cleans things up: switching the revision parsing and listing over to the array makes things like the builtin-diff usage much simpler (we now see exactly how many members the array has, and we don't get the objects reversed from the order they were on the command line). One of the main reasons for doing this at all is that the malloc overhead of the simple object list was actually pretty high, and the array is just a lot denser. So this patch brings down memory usage by git-rev-list by just under 3% (on top of all the other memory use optimizations) on the mozilla archive. It does add more lines than it removes, and more importantly, it adds a whole new infrastructure for maintaining lists of objects, but on the other hand, the new dynamic array code is pretty obvious. The change to builtin-diff-tree.c shows a fairly good example of why an array interface is sometimes more natural, and just much simpler for everybody. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 01:45:48 UTC |
| f0b7367 | Junio C Hamano | 20 June 2006, 01:25:21 UTC | Restore SIGCHLD to SIG_DFL where we care about waitpid(). It was reported that under one implementation of socks client "git clone" fails with "error: waitpid failed (No child processes)", because "git" is spawned after setting SIGCHLD to SIG_IGN. Arguably it may be a broken setting, but we should protect ourselves so that we can get reliable results from waitpid() for the children we care about. This patch resets SIGCHLD to SIG_DFL in three places: - connect.c::git_connect() - initiators of git native protocol transfer are covered with this. - daemon.c::main() - obviously. - merge-index.c::main() - obviously. There are other programs that do fork() but do not waitpid(): http-push, imap-send. upload-pack does not either, but in the case of that program, each of the forked halves runs exec() another program, so this change would not have much effect there. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 01:44:58 UTC |
| d281786 | Junio C Hamano | 20 June 2006, 00:01:35 UTC | xdiff: minor changes to match libxdiff-0.21 This reformats the change 621c53cc082299eaf69e9f2dc0274547c7d87fb0 introduced to match what upstream author implemented in libxdiff-0.21 without changing any logic (hopefully ;-). This is to help keep us in sync with the upstream. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 01:43:49 UTC |
| 0da4677 | Junio C Hamano | 19 June 2006, 22:00:17 UTC | fix rfc2047 formatter. Running git-format-patch on patches from Lukas destroyed the From: line. This fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 01:43:30 UTC |
| 0e26f7a | Dennis Stosberg | 19 June 2006, 19:40:37 UTC | Fix t8001-annotate and t8002-blame for ActiveState Perl There seems to be at least one implementation of Perl which requires the user to specify an extension for backup files. Reported by Alex Riesen. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 01:43:20 UTC |
| 855419f | Linus Torvalds | 19 June 2006, 17:44:15 UTC | Add specialized object allocator This creates a simple specialized object allocator for basic objects. This avoids wasting space with malloc overhead (metadata and extra alignment), since the specialized allocator knows the alignment, and that objects, once allocated, are never freed. It also allows us to track some basic statistics about object allocations. For example, for the mozilla import, it shows object usage as follows: blobs: 627629 (14710 kB) trees: 1119035 (34969 kB) commits: 196423 (8440 kB) tags: 1336 (46 kB) and the simpler allocator shaves off about 2.5% off the memory footprint off a "git-rev-list --all --objects", and is a bit faster too. [ Side note: this concludes the series of "save memory in object storage". The thing is, there simply isn't much more to be saved on the objects. Doing "git-rev-list --all --objects" on the mozilla archive has a final total RSS of 131498 pages for me: that's about 513MB. Of that, the object overhead is now just 56MB, the rest is going somewhere else (put another way: the fact that this patch shaves off 2.5% of the total memory overhead, considering that objects are now not much more than 10% of the total shows how big the wasted space really was: this makes object allocations much more memory- and time-efficient). I haven't looked at where the rest is, but I suspect the bulk of it is just the pack-file loading. It may be that we should pack the tree objects separately from the blob objects: for git-rev-list --objects, we don't actually ever need to even look at the blobs, but since trees and blobs are interspersed in the pack-file, we end up not being dense in the tree accesses, so we end up looking at more pages than we strictly need to. So with a 535MB pack-file, it's entirely possible - even likely - that most of the remaining RSS is just the mmap of the pack-file itself. We don't need to map in _all_ of it, but we do end up mapping a fair amount. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 01:42:21 UTC |
| 5f1a63e | Johannes Schindelin | 19 June 2006, 23:48:03 UTC | Read configuration also from $HOME/.gitconfig This patch is based on Pasky's, with three notable differences: - I did not yet update the documentation - I named it .gitconfig, not .gitrc - git-repo-config does not barf when a unique key is overridden locally The last means that if you have something like [alias] l = log --stat -M in ~/.gitconfig, and [alias] l = log --stat -M next.. in $GIT_DIR/config, then git-repo-config alias.l returns only one value, namely the value from $GIT_DIR/config. If you set the environment variable GIT_CONFIG, $HOME/.gitconfig is not read, and neither $GIT_DIR/config, but $GIT_CONFIG instead. If you set GIT_CONFIG_LOCAL instead, it is interpreted instead of $GIT_DIR/config, but $HOME/.gitconfig is still read. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 00:53:13 UTC |
| 9c3796f | Johannes Schindelin | 19 June 2006, 22:51:58 UTC | Fix setting config variables with an alternative GIT_CONFIG When setting a config variable, git_config_set() ignored the variables GIT_CONFIG and GIT_CONFIG_LOCAL. Now, when GIT_CONFIG_LOCAL is set, it will write to that file. If not, GIT_CONFIG is checked, and only as a fallback, the change is written to $GIT_DIR/config. Add a test for it, and also future-proof the test for the upcoming $HOME/.gitconfig support. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 00:30:34 UTC |
| 928e47e | Johannes Schindelin | 19 June 2006, 22:55:20 UTC | Initialize lock_file struct to all zero. hold_lock_file_for_update() relies on that. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 June 2006, 00:04:27 UTC |
| 75c84dd | Jakub Narebski | 19 June 2006, 18:27:59 UTC | Make CSS file gitweb/gitweb.css more readable Taken from git://git.xmms.se/xmms2/gitweb-xmms2.git commit 561262030d58a6325f500b36d836dbe02a5abc68 "Make CSS readable" by Daniel Svensson, with extra parts removed and consistent whitespace usage. [jc: tabified the results to cleaning things up, and removed an added item that was commented out. ] Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 20:13:07 UTC |
| 275fb96 | Junio C Hamano | 19 June 2006, 05:13:54 UTC | Merge early parts of branch 'ff/c99' | 19 June 2006, 05:13:54 UTC |
| 69c18d8 | Junio C Hamano | 19 June 2006, 05:13:11 UTC | Merge early parts of branch 'ls/am' | 19 June 2006, 05:13:11 UTC |
| 854b462 | Lukas Sandström | 13 June 2006, 20:22:00 UTC | Make git-update-ref a builtin Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 05:12:20 UTC |
| fefe81c | Lukas Sandström | 13 June 2006, 20:21:57 UTC | Make git-update-index a builtin Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 05:12:19 UTC |
| 7499c99 | Lukas Sandström | 13 June 2006, 20:21:53 UTC | Make git-stripspace a builtin Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 05:12:16 UTC |
| 34488e3 | Lukas Sandström | 13 June 2006, 20:21:50 UTC | Make git-mailinfo a builtin [jc: with a bit of constness tightening] Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 05:10:28 UTC |
| e690e84 | Lukas Sandström | 13 June 2006, 20:21:46 UTC | Make git-mailsplit a builtin Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:58:20 UTC |
| 8ed05fb | Lukas Sandström | 13 June 2006, 20:21:42 UTC | Make git-write-tree a builtin Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:58:19 UTC |
| cc1dca7 | Junio C Hamano | 19 June 2006, 04:50:19 UTC | Merge branch 'jn/web' into next * jn/web: Fix gitweb stylesheet Support for the standard mime.types map in gitweb gitweb: text files for 'blob_plain' action without charset by default gitweb: safely output binary files for 'blob_plain' action Move gitweb style to gitweb.css | 19 June 2006, 04:50:19 UTC |
| 42d5042 | Junio C Hamano | 19 June 2006, 04:48:32 UTC | Merge branch 'pb/config' into next * pb/config: Support for extracting configuration from different files Fix PPC SHA1 routine for large input buffers Make t8001-annotate and t8002-blame more portable Remove "refs" field from "struct object" Make release tarballs friendlier to older tar versions | 19 June 2006, 04:48:32 UTC |
| c729127 | Jakub Narebski | 18 June 2006, 06:45:03 UTC | Fix gitweb stylesheet An earlier commit forgot to move some piece from the CGI script to the external stylesheet. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:19:14 UTC |
| 2d00737 | Petr Baudis | 17 June 2006, 22:01:06 UTC | Support for the standard mime.types map in gitweb gitweb will try to look up the filename mimetype in /etc/mime.types and optionally a user-configured mime.types map as well. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:19:14 UTC |
| ad14e93 | Jakub Narebski | 17 June 2006, 16:07:24 UTC | gitweb: text files for 'blob_plain' action without charset by default $default_text_plain_charset is undefined (no specified charset) by default. Additionally ':raw' layer for binmode is used for outputting file content. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:19:14 UTC |
| f5aa79d | Jakub Narebski | 17 June 2006, 11:32:15 UTC | gitweb: safely output binary files for 'blob_plain' action gitweb tries now to output correct Content-Type header for 'blob_plain' action; for now text/plain for text files, appropriate image MIME type for *.png, *.gif and *.jpg/*.jpeg files, and application/octet-stream for other binary files. Introduced new configuration variables: $default_blob_plain_mimetype and $default_text_plain_charset (only 'utf-8' is guaranteed to work for the latter). binmode changed to ':raw' in git_blob_plain for output of non-text files. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:19:14 UTC |
| aedd942 | Jakub Narebski | 17 June 2006, 09:23:56 UTC | Move gitweb style to gitweb.css Move gitweb style from embedded <style> element in gitweb/gitweb.cgi to external CSS file gitweb/gitweb.css. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:19:13 UTC |
| 2bda77e | Florian Forster | 18 June 2006, 15:18:08 UTC | Change types used in bitfields to be `int's. According to ANSI C99 bitfields are only defined for `signed int' and `unsigned int'. This patch corrects the bitfield in the `msg_data_t' type from `imap-send.c'. Signed-off-by: Florian Forster <octo@verplant.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:19:10 UTC |
| 571ea60 | Florian Forster | 18 June 2006, 15:18:07 UTC | Don't use empty structure initializers. Empty initializers for structures are not allowed in ANSI C99. This patch removes such an initializer from `builtin-read-tree.c'. Since the struct was static (and is therefore implicitely initialized to zero anyway) it wasn't actually needed. Signed-off-by: Florian Forster <octo@verplant.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:19:10 UTC |
| 04f0860 | Florian Forster | 18 June 2006, 15:18:06 UTC | Cast pointers to `void *' when used in a format. ANSI C99 requires void-pointers when using the `%p' format. This patch adds the neccessary cast in `blame.c'. Signed-off-by: Florian Forster <octo@verplant.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:19:10 UTC |
| b4b1550 | Florian Forster | 18 June 2006, 15:18:05 UTC | Don't instantiate structures with FAMs. Since structures with `flexible array members' are an incomplete datatype ANSI C99 forbids creating instances of them. This patch removes such an instance from `diff-lib.c' and replaces it with a pointer to a `struct combine_diff_path'. Since all neccessary memory is allocated at once the number of calls to `xmalloc' is not increased. Signed-off-by: Florian Forster <octo@verplant.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:19:09 UTC |
| 63f1756 | Florian Forster | 18 June 2006, 15:18:04 UTC | Initialize FAMs using `FLEX_ARRAY'. When initializing a `flexible array member' the macro `FLEX_ARRAY' should be used. This was forgotten in `diff-delta.c'. Signed-off-by: Florian Forster <octo@verplant.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:19:09 UTC |
| cfd432e | Florian Forster | 18 June 2006, 15:18:03 UTC | Remove ranges from switch statements. Though very nice and readable, the "case 'a'...'z':" construct is not ANSI C99 compliant. This patch unfolds the range in `quote.c' and substitutes the switch-statement with an if-statement in `http-fetch.c' and `http-push.c'. Signed-off-by: Florian Forster <octo@verplant.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:19:09 UTC |
| 7f29f7a | Petr Baudis | 17 June 2006, 23:23:58 UTC | Support for extracting configuration from different files Add $GIT_CONFIG environment variable whose content is used instead of .git/config if set. Also add $GIT_CONFIG_LOCAL as a forward-compatibility cue for whenever we will finally come to support] global configuration files (properly). Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 04:19:07 UTC |
| 64e86c5 | Junio C Hamano | 19 June 2006, 04:18:49 UTC | Merge branch 'yl/build' * yl/build: auto-detect changed prefix and/or changed build flags | 19 June 2006, 04:18:49 UTC |
| d9faeca | Junio C Hamano | 19 June 2006, 03:19:09 UTC | Merge branch 'jc/shared' * jc/shared: shared repository: optionally allow reading to "others". | 19 June 2006, 03:19:09 UTC |
| 72afd3e | Junio C Hamano | 19 June 2006, 03:18:21 UTC | Merge branch 'eb/mail' * eb/mail: Fix git-format-patch -s | 19 June 2006, 03:18:21 UTC |
| b47f509 | Paul Mackerras | 18 June 2006, 23:25:16 UTC | Fix PPC SHA1 routine for large input buffers The PPC SHA1 routine had an overflow which meant that it gave incorrect results for input buffers >= 512MB. This fixes it by ensuring that the update of the total length in bits is done using 64-bit arithmetic. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 June 2006, 03:12:20 UTC |
| 476a4df | Dennis Stosberg | 18 June 2006, 20:33:21 UTC | Make t8001-annotate and t8002-blame more portable These two tests assume that "sed" will not modify the final line of a stream if it does not end with a newline character. The assumption is not true at least for FreeBSD and Solaris 9. FreeBSD's "sed" appends a newline character; "sed" in Solaris 9 even removes the incomplete final line. This patch makes the test use perl instead. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 20:58:20 UTC |
| 3e4339e | Linus Torvalds | 18 June 2006, 18:45:02 UTC | Remove "refs" field from "struct object" This shrinks "struct object" to the absolutely minimal size possible. It now contains /only/ the object flags and the SHA1 hash name of the object. The "refs" field, which is really needed only for fsck, is maintained in a separate hashed lookup-table, allowing all normal users to totally ignore it. This helps memory usage, although not as much as I hoped: it looks like the allocation overhead of malloc (and the alignment constraints in particular) means that while the structure size shrinks, the actual allocation overhead mostly does not. [ That said: memory usage is actually down, but not as much as it should be: I suspect just one of the object types actually ended up shrinking its effective allocation size. To get to the next level, we probably need specialized allocators that don't pad the allocation more than necessary. ] The separation makes for some code cleanup, though, and makes the ref tracking that fsck wants a clearly separate thing. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 20:51:27 UTC |
| 9cd625b | Rene Scharfe | 18 June 2006, 13:25:33 UTC | Make release tarballs friendlier to older tar versions git-tar-tree adds an extended pax header to archives if its first parameter points to a commit. It confuses older tars and isn't very useful in the case of git anyway, so stop doing it. Idea: Junio, implementation: Junio. I just wrote it up. :-) Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 18:29:36 UTC |
| 94b9e07 | Junio C Hamano | 18 June 2006, 11:20:50 UTC | Merge branch 'master' into next * master: git-tar-tree: no more void pointer arithmetic git-tar-tree: documentation update git-tar-tree: Simplify write_trailer() | 18 June 2006, 11:20:50 UTC |
| 6698060 | Rene Scharfe | 18 June 2006, 10:58:01 UTC | git-tar-tree: no more void pointer arithmetic Noticed by Florian Forster: Use a char pointer when adding offsets, because void pointer arithmetic is a GNU extension. Const'ify the function arguments while we're at it. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 11:18:43 UTC |
| 9236cdd | Rene Scharfe | 18 June 2006, 10:57:59 UTC | git-tar-tree: documentation update * add example on how to avoid adding a global extended pax header * don't mention linux anymore, use git itself as an example instead * update to v1.4.0 ;-) * append missing :: to the examples Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 11:18:25 UTC |
| 37958be | Rene Scharfe | 18 June 2006, 10:57:56 UTC | git-tar-tree: Simplify write_trailer() We can write the trailer in one or at most two steps; it will always fit within two blocks. With the last caller of get_record() gone we can get rid of it. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 11:17:49 UTC |
| 1910fe0 | Junio C Hamano | 18 June 2006, 02:17:41 UTC | Merge branch 'yl/build' into next * yl/build: auto-detect changed prefix and/or changed build flags | 18 June 2006, 02:17:41 UTC |
| ca3bcab | Yakov Lerner | 14 June 2006, 22:36:00 UTC | auto-detect changed prefix and/or changed build flags Detect changed prefix and/or changed build flags in the middle of the build (or between 'make' and 'make install'), and if change is detected, make sure all objects are compiled with same build flags and same prefix, thus avoiding inconsistent/broken build. [jc: removed otherwise unnecessary Makefile target to test the change this patch introduces. ] Signed-off-by: Yakov Lerner <iler.ml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 02:17:34 UTC |
| 8a02ad4 | Junio C Hamano | 18 June 2006, 01:56:08 UTC | Merge branch 'eb/mail' into next * eb/mail: Fix git-format-patch -s Some more memory leak avoidance Move "void *util" from "struct object" into "struct commit" Shrink "struct object" a bit | 18 June 2006, 01:56:08 UTC |
| 6c4cca1 | Eric W. Biederman | 12 June 2006, 19:31:38 UTC | Fix git-format-patch -s When git-format-patch was converted to a builtin an appropriate call to setup_ident was missed and thus git-format-patch -s fails because it doesn't look up anything in the password file. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 01:51:53 UTC |
| cb11574 | Linus Torvalds | 18 June 2006, 01:47:58 UTC | Some more memory leak avoidance This is really the dregs of my effort to not waste memory in git-rev-list, and makes barely one percent of a difference in the memory footprint, but hey, it's also a pretty small patch. It discards the parent lists and the commit buffer after the commit has been shown by git-rev-list (and "git log" - which already did the commit buffer part), and frees the commit list entry that was used by the revision walker. The big win would be to get rid of the "refs" pointer in the object structure (another 5%), because it's only used by fsck. That would require some pretty major surgery to fsck, though, so I'm timid and did the less interesting but much easier part instead. This (percentually) makes a bigger difference to "git log" and friends, since those are walking _just_ commits, and thus the list entries tend to be a bigger percentage of the memory use. But the "list all objects" case does improve too. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 01:49:52 UTC |
| d3ff6f5 | Linus Torvalds | 18 June 2006, 01:26:18 UTC | Move "void *util" from "struct object" into "struct commit" Every single user actually wanted this only for commit objects, and we have no reason to waste space on it for other object types. So just move the structure member from the low-level "struct object" into the "struct commit". This leaves the commit object the same size, and removes one unnecessary pointer from all other object allocations. This shrinks memory usage (still at a fairly hefty half-gig, admittedly) of "git-rev-list --all --objects" on the mozilla repo by another 5% in my tests. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 01:49:45 UTC |
| 885a86a | Linus Torvalds | 14 June 2006, 23:45:13 UTC | Shrink "struct object" a bit This shrinks "struct object" by a small amount, by getting rid of the "struct type *" pointer and replacing it with a 3-bit bitfield instead. In addition, we merge the bitfields and the "flags" field, which incidentally should also remove a useless 4-byte padding from the object when in 64-bit mode. Now, our "struct object" is still too damn large, but it's now less obviously bloated, and of the remaining fields, only the "util" (which is not used by most things) is clearly something that should be eventually discarded. This shrinks the "git-rev-list --all" memory use by about 2.5% on the kernel archive (and, perhaps more importantly, on the larger mozilla archive). That may not sound like much, but I suspect it's more on a 64-bit platform. There are other remaining inefficiencies (the parent lists, for example, probably have horrible malloc overhead), but this was pretty obvious. Most of the patch is just changing the comparison of the "type" pointer from one of the constant string pointers to the appropriate new TYPE_xxx small integer constant. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 01:49:18 UTC |
| 210a0be | Junio C Hamano | 18 June 2006, 00:57:33 UTC | Merge early part of branch 'jc/fetchupload' | 18 June 2006, 00:57:33 UTC |
| 75c3a5c | Junio C Hamano | 18 June 2006, 00:56:52 UTC | Merge branch 'jc/rw-prefix' * jc/rw-prefix: read-tree: reorganize bind_merge code. write-tree: --prefix=<path> read-tree: --prefix=<path>/ option. | 18 June 2006, 00:56:52 UTC |
| 8c278ab | Junio C Hamano | 18 June 2006, 00:49:28 UTC | Merge branch 'pe/date' * pe/date: date.c: improve guess between timezone offset and year. | 18 June 2006, 00:49:28 UTC |
| fc5201a | Junio C Hamano | 18 June 2006, 00:08:36 UTC | Merge branch 'js/diff' | 18 June 2006, 00:08:36 UTC |
| cd112ce | Johannes Schindelin | 13 June 2006, 16:45:44 UTC | diff options: add --color This patch is a slightly adjusted version of Junio's patch: http://www.gelato.unsw.edu.au/archives/git/0604/19354.html However, instead of using a config variable, this patch makes it available as a diff option. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 00:08:16 UTC |
| ae448e3 | Junio C Hamano | 17 June 2006, 23:58:51 UTC | mailinfo: ignore blanks after in-body headers. [jc: this is based on Eric's patch but also fixes up the parsed subject headers]. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 June 2006, 00:05:36 UTC |
| 2662dbf | Eric W. Biederman | 12 June 2006, 19:48:35 UTC | Don't parse any headers in the real body of an email message. It was pointed out that the current behaviour might mispart a patch comment so remove this behaviour for now. [jc: this fixes "From: line in the middle" check in t5100 test.] Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 June 2006, 23:27:12 UTC |
| 4839c0b | Junio C Hamano | 17 June 2006, 22:20:36 UTC | t5100: mailinfo and mailsplit tests. Currently the test passes with 1.3.3 but not with the tip of "master". This is to verify the fixes from Eric W Biedermann. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 June 2006, 23:26:20 UTC |
| f0338bb | Dennis Stosberg | 17 June 2006, 15:02:45 UTC | Make t4101-apply-nonl bring along its patches Some versions of "diff" (e.g. on FreeBSD and older Linux systems) do not support the "\ No newline at end of file" remark and are not able to generate the patches needed for this test. This lets the test fail, although git-apply is working perfectly. This patch adds the pre-generated patches to t/t4100/ and makes the test use them. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 June 2006, 23:06:21 UTC |
| 175fb6c | Jakub Narebski | 17 June 2006, 06:53:45 UTC | Update gitweb README: gitweb is now included with git Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 June 2006, 23:06:20 UTC |
| e968751 | Sven Verdoolaege | 17 June 2006, 17:46:40 UTC | git-cvsexportcommit.perl: fix typo Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 June 2006, 23:06:18 UTC |
| 9202434 | Linus Torvalds | 11 June 2006, 17:57:35 UTC | gitweb.cgi history not shown This does: - add a "rev.simplify_history" flag which defaults to on - it turns it off for "git whatchanged" (which thus now has real semantics outside of "git log") - it adds a command line flag ("--full-history") to turn it off for others (ie you can make "git log" and "gitk" etc get the semantics if you want to. Now, just as an example of _why_ you really really really want to simplify history by default, apply this patch, install it, and try these two command lines: gitk --full-history -- git.c gitk -- git.c and compare the output. So with this, you can also now do git whatchanged -p -- gitweb.cgi git log -p --full-history -- gitweb.cgi and it will show the old history of gitweb.cgi, even though it's not relevant to the _current_ state of the name "gitweb.cgi" NOTE NOTE NOTE! It will still actually simplify away merges that didn't change anything at all into either child. That creates these bogus strange discontinuities if you look at it with "gitk" (look at the --full-history gitk output for git.c, and you'll see a few strange cases). So the whole "--parent" thing ends up somewhat bogus with --full-history because of this, but I'm not sure it's worth even worrying about. I don't think you'd ever want to really use "--full-history" with the graphical representation, I just give it as an example exactly to show _why_ doing so would be insane. I think this is trivial enough and useful enough to be worth merging into the stable branch. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 June 2006, 05:53:11 UTC |
| bfbd0bb | Peter Eriksen | 11 June 2006, 12:03:28 UTC | Implement safe_strncpy() as strlcpy() and use it more. Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 June 2006, 05:45:12 UTC |
