| 7271328 | Junio C Hamano | 18 September 2005, 22:45:59 UTC | GIT 0.99.7 | 18 September 2005, 22:45:59 UTC |
| 87c6aeb | Junio C Hamano | 18 September 2005, 22:45:09 UTC | Arrgh -- another asciidoc caret workaround. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 September 2005, 22:45:09 UTC |
| 34143b2 | Petr Baudis | 18 September 2005, 19:09:22 UTC | [PATCH] Improve git-update-index error reporting This makes git-update-index error reporting much less confusing. The user will know what went wrong with better precision, and will be given a hopefully less confusing advice. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 September 2005, 21:18:57 UTC |
| 37539fb | Linus Torvalds | 18 September 2005, 18:27:45 UTC | [PATCH] Improved "git add" This fixes everybodys favourite complaint about "git add", namely that it doesn't take directories. We use "git-ls-files --others" to generate an arbitrary list of filenames, and thus also automatically honor ignore-files while we're at it. Side note: there's a lot of room for improvement here. In particular, if we have a long list of filenames (importing a big archive), this will just do a big stupid for-loop and add them one at a time. Maybe it should use generate-list | xargs -0 git-update-idex --add -- instead. Also, I think we should have a default ignore list if we don't find a .git/info/exclude file. Ignoring "*.o" and ".*" by default would probably be the right thing to do. But I think this is a good first step. Use the "-n" flag to just show the list of files to be added without adding them. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 September 2005, 21:18:38 UTC |
| a8783ee | Linus Torvalds | 18 September 2005, 18:18:30 UTC | [PATCH] Add "--git-dir" flag to git-rev-parse Especially when you're deep inside the git repository, it's not all that trivial for scripts to figure out where GIT_DIR is if it isn't set. So add a flag to git-rev-parse to show where it is, since it will have figured it out anyway. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 September 2005, 21:18:34 UTC |
| 1b0c1e6 | Daniel Barkalow | 18 September 2005, 18:14:19 UTC | [PATCH] Support alternates and http-alternates in http-fetch This allows the remote repository to refer to additional repositories in a file objects/info/http-alternates or objects/info/alternates. Each line may be: a relative path, starting with ../, to get from the objects directory of the starting repository to the objects directory of the added repository. an absolute path of the objects directory of the added repository (on the same server). (only in http-alternates) a full URL of the objects directory of the added repository. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 September 2005, 21:14:52 UTC |
| 3a45f62 | Junio C Hamano | 18 September 2005, 18:13:58 UTC | Document extended SHA1 used by git-rev-parse. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 September 2005, 21:12:43 UTC |
| 029f6de | Junio C Hamano | 18 September 2005, 21:11:53 UTC | fetch() assumes we do not have the object. Bugfix for the previous one. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 September 2005, 21:11:53 UTC |
| 8ac93bc | Junio C Hamano | 18 September 2005, 08:18:15 UTC | Merge branch 'master' of . | 18 September 2005, 08:18:15 UTC |
| 85d106c | Junio C Hamano | 18 September 2005, 08:01:07 UTC | Improve the safety check used in fetch.c The recent safety check to trust only the commits we have made things impossibly slow and turn out to waste a lot of memory. This commit fixes it with the following improvements: - mark already scanned objects and avoid rescanning the same object again; - free the tree entries when we have scanned the tree entries; this is the same as b0d8923ec01fd91b75ab079034f89ced91500157 which reduced memory usage by rev-list; - plug memory leak from the object_list dequeuing code; - use the process_queue not just for fetching but for scanning, to make things tail recursive to avoid deep recursion; the deep recursion was especially prominent when we cloned a big pack. - avoid has_sha1_file() call when we already know we do not have that object. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 September 2005, 08:01:07 UTC |
| 490e23d | Junio C Hamano | 18 September 2005, 06:35:49 UTC | Archive-destroying "git repack -a -d" bug. Using "git repack -a -d" can destroy your git archive if you use it twice in succession, because the new pack can be called the same as the old pack. Found by Linus. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 September 2005, 06:35:49 UTC |
| 434d036 | Junio C Hamano | 17 September 2005, 20:51:03 UTC | Do not fail after calling bisect_auto_next() As a convenience measure, 'bisect bad' or 'bisect good' automatically does 'bisect next' when it knows it can, but the result of that test to see if it can was leaking through as the exit code from the whole thing, which was bad. Noticed by Anton Blanchard. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 September 2005, 20:51:03 UTC |
| b366156 | Daniel Barkalow | 15 September 2005, 03:26:08 UTC | [PATCH] Add support for alternates in HTTP This tries .../objects/info/http-alternates and then .../objects/info/alternates, looking for a file which specifies where else to download objects and packs from. It currently only supports absolute paths, and doesn't support full URLs. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 September 2005, 18:57:50 UTC |
| 50d69ef | Junio C Hamano | 17 September 2005, 06:27:52 UTC | Fix typo in test comment. I do not know why it was spelled git-rev-tree when I meant to say git-read-tree, but the typo was left since day one. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 September 2005, 18:57:50 UTC |
| 5a90d4a | Junio C Hamano | 12 September 2005, 05:25:49 UTC | [PATCH] getdomainname should be usable on SunOS with -lnsl Jason Riedy suggests that we should be able to use getdomainname if we properly specify which libraries to link. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 September 2005, 18:57:50 UTC |
| aa894d8 | Linus Torvalds | 17 September 2005, 01:02:46 UTC | [PATCH] Make "git shortlog" understand raw logs This is a nicer fix for git-shortlog being unable to handle the raw log format. Just use a more permissive regexp instead of doing two nearly identical ones. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 September 2005, 18:57:50 UTC |
| 2a7055a | Linus Torvalds | 17 September 2005, 00:53:19 UTC | [PATCH] Fix "git-rev-list" revision range parsing There were two bugs in there: - if the range didn't end up working, we restored the '.' character in the wrong place. - an empty end-of-range should be interpreted as HEAD. See rev-parse.c for the reference implementation of this. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 September 2005, 18:57:50 UTC |
| a09af24 | Junio C Hamano | 17 September 2005, 03:40:12 UTC | Add git-send-email to .gitignore Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 September 2005, 18:57:49 UTC |
| 4447bad | Junio C Hamano | 17 September 2005, 18:56:41 UTC | Teach rsync transport about alternates. For local operations and downloading and uploading via git aware protocols, use of $GIT_OBJECT_DIRECTORY/info/alternates is recommended on the server side for big projects that are derived from another one (like Linux kernel). However, dumb protocols and rsync transport needs to resolve this on the client end, which we did not bother doing until this week. I noticed we use "rsync -z" but most of our payload is already compressed, which was not quite right. This commit also fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 September 2005, 18:56:41 UTC |
| 8805cca | Linus Torvalds | 16 September 2005, 21:55:33 UTC | [PATCH] Avoid building object ref lists when not needed The object parsing code builds a generic "this object references that object" because doing a full connectivity check for fsck requires it. However, nothing else really needs it, and it's quite expensive for git-rev-list that can have tons of objects in flight. So, exactly like the commit buffer save thing, add a global flag to disable it, and use it in git-rev-list. Before: $ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l 12.28user 0.29system 0:12.57elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+26718minor)pagefaults 0swaps 59124 After this change: $ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l 10.33user 0.18system 0:10.54elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+18509minor)pagefaults 0swaps 59124 and note how the number of pages touched by git-rev-list for this particular object list has shrunk from 26,718 (104 MB) to 18,509 (72 MB). Calculating the total object difference between two git revisions is still clearly the most expensive git operation (both in memory and CPU time), but it's now less than 40% of what it used to be. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 September 2005, 22:32:23 UTC |
| b0d8923 | Linus Torvalds | 16 September 2005, 21:32:48 UTC | [PATCH] Improve git-rev-list memory usage further This avoids keeping tree entries around, and free's them as it traverses the list. This avoids building up a huge memory footprint just for these small but very common allocations. Before: $ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l 11.65user 0.38system 0:12.65elapsed 95%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+42934minor)pagefaults 0swaps 59124 After: $ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l 12.28user 0.29system 0:12.57elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+26718minor)pagefaults 0swaps 59124 Note how the minor fault numbers - which ends up being how many pages we needed to map - go down from 42934 (167 MB) to 26718 (104 MB). That is: Before: 42934 minor pagefaults After: 26718 minor pagefaults This is all in _addition_ to the previous fixes. It used to be ~48,000 pagefaults. That's still a honking big memory footprint, but it's about half of what it was just a day or two ago (and this is the object list for a pretty big update - almost 60,000 objects. Smaller updates need less memory). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 September 2005, 22:19:07 UTC |
| d0ac30f | Junio C Hamano | 16 September 2005, 21:30:29 UTC | [PATCH] fetch.c: cleanups Clean-ups suggested by Sergey Vlasov and acked by Daniel Barkalow. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 September 2005, 22:16:45 UTC |
| 2842375 | Matthias Urlichs | 16 September 2005, 11:54:10 UTC | [PATCH] Debian: build-depend on "bc" Build systems should run tests. This patch adds the necessary debian/control and debian/rules bits ("bc" was missing, t/t4002-diff-basic.sh wants it). Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 September 2005, 22:16:42 UTC |
| 6b82d16 | Junio C Hamano | 16 September 2005, 19:30:46 UTC | [PATCH] Make git-checkout failure message more friendly. ... or less so, perhaps ;-). Suggested by Jeff Garzik. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 September 2005, 22:16:40 UTC |
| 0e60471 | Chris Wright | 16 September 2005, 20:38:49 UTC | [PATCH] Update git-core.spec.in Update git-core spec file based on feedback from Fedora Extras review. - update BuildRoot to be more specific - eliminate Requires that must be satisfied for base system install - drop Vendor - use dist tag to differentiate between branches - own %{_datadir}/git-core/ - use RPM_OPT_FLAGS in spec file Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 September 2005, 22:16:37 UTC |
| ed0a848 | Peter Hagervall | 16 September 2005, 14:24:12 UTC | [PATCH] PATCH Documentation/git-rev-list.txt typo fix An earlier commit causes a mismatch in <emphasis> and <superscript> tags, one way of fixing it is having no more than one caret symbol per line, which is the only solution I found in the asciidoc documentation. Ugly, but it works. [jc: ugly indeed but that is not Peter's fault.] Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 September 2005, 22:16:35 UTC |
| b93aa3e | Junio C Hamano | 16 September 2005, 06:33:03 UTC | Recommend 'less' for Debian. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 September 2005, 06:33:03 UTC |
| c6ae615 | Horst von Brand | 16 September 2005, 04:08:24 UTC | [PATCH] Require less in RPM spec ... and the next one will be the one to do Debian, naturally. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 September 2005, 06:31:44 UTC |
| b4416b4 | Junio C Hamano | 16 September 2005, 00:38:26 UTC | Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 September 2005, 00:38:26 UTC |
| 316eee8 | jdl@freescale.com | 15 September 2005, 22:40:13 UTC | [PATCH] Documentation/git-rev-list.txt typo fix Fix the "superscript" problem on the git-rev-list doc page. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 September 2005, 00:06:58 UTC |
| 5bdbaaa | Linus Torvalds | 15 September 2005, 22:14:29 UTC | [PATCH] Re-organize "git-rev-list --objects" logic The logic to calculate the full object list used to be very inter-twined with the logic that looked up the commits. For no good reason - it's actually a lot simpler to just do that logic as a separate pass. This improves performance a bit, and uses slightly less memory in my tests, but more importantly it makes the code simpler to work with and follow what it does. The performance win is less than I had hoped for, but I get: Before: [torvalds@g5 linux]$ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l 13.64user 0.42system 0:14.13elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+47947minor)pagefaults 0swaps 58945 After: [torvalds@g5 linux]$ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l 11.80user 0.36system 0:12.16elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+42684minor)pagefaults 0swaps 58945 ie it improved by 2 seconds, and took a 5000+ fewer pages (hey, that's 20MB out of 174MB to go). And got the same number of objects (in theory, the more expensive one might find some more shared objects to avoid. In practice it obviously doesn't). I know how to make it use _lots_ less memory, which will probably speed it up. But that's for another time, and I'd prefer to see this go in first. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 September 2005, 23:19:44 UTC |
| 5098baf | Junio C Hamano | 15 September 2005, 23:13:43 UTC | Plug diff leaks. It is a bit embarrassing that it took this long for a fix since the problem was first reported on Aug 13th. Message-ID: <87y876gl1r.wl@mail2.atmark-techno.com> From: Yasushi SHOJI <yashi@atmark-techno.com> Newsgroups: gmane.comp.version-control.git Subject: [patch] possible memory leak in diff.c::diff_free_filepair() Date: Sat, 13 Aug 2005 19:58:56 +0900 This time I used valgrind to make sure that it does not overeagerly discard memory that is still being used. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 September 2005, 23:13:43 UTC |
| 98533b9 | Junio C Hamano | 15 September 2005, 22:06:39 UTC | Avoid wasting memory while keeping track of what we have during fetch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 September 2005, 22:06:39 UTC |
| 60ab26d | Linus Torvalds | 15 September 2005, 21:43:17 UTC | [PATCH] Avoid wasting memory in git-rev-list As pointed out on the list, git-rev-list can use a lot of memory. One low-hanging fruit is to free the commit buffer for commits that we parse. By default, parse_commit() will save away the buffer, since a lot of cases do want it, and re-reading it continually would be unnecessary. However, in many cases the buffer isn't actually necessary and saving it just wastes memory. We could just free the buffer ourselves, but especially in git-rev-list, we actually end up using the helper functions that automatically add parent commits to the commit lists, so we don't actually control the commit parsing directly. Instead, just make this behaviour of "parse_commit()" a global flag. Maybe this is a bit tasteless, but it's very simple, and it makes a noticable difference in memory usage. Before the change: [torvalds@g5 linux]$ /usr/bin/time git-rev-list v2.6.12..HEAD > /dev/null 0.26user 0.02system 0:00.28elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+3714minor)pagefaults 0swaps after the change: [torvalds@g5 linux]$ /usr/bin/time git-rev-list v2.6.12..HEAD > /dev/null 0.26user 0.00system 0:00.27elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+2433minor)pagefaults 0swaps note how the minor faults have decreased from 3714 pages to 2433 pages. That's all due to the fewer anonymous pages allocated to hold the comment buffers and their metadata. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 September 2005, 21:57:52 UTC |
| f71a69a | Junio C Hamano | 15 September 2005, 21:56:37 UTC | Be more backward compatible with git-ssh-{push,pull}. HPA reminded me that these programs knows about the name of the counterpart on the other end and simply symlinking the old name to new name locally would not be enough. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 September 2005, 21:56:37 UTC |
| 0de68d2 | H. Peter Anvin | 15 September 2005, 19:33:14 UTC | [PATCH] rsh.c env and quoting cleanup, take 2 This patch does proper quoting, and uses "env" to be compatible with tcsh. As a side benefit, I believe the code is a lot cleaner to read. [jc: I am accepting this not because I necessarily agree with the quoting approach taken by it, but because (1) the code is only used by ssh-fetch/ssh-upload pair which I do not care much about (if you have ssh account on the remote end you should be using git-send-pack git-fetch-pack pair over ssh anyway), and (2) HPA is one of the more important customers belonging to the Linux kernel community and I want to help his workflow -- which includes not wasting his time by asking him to switch to git-send-pack/git-fetch-pack pair, nor to use a better shell ;-). I might not have taken this patch if it mucked with git_connect in connect.c in its current form.] Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 September 2005, 20:42:03 UTC |
| 22c6e1d | Daniel Barkalow | 15 September 2005, 01:31:42 UTC | [PATCH] Fix fetch completeness assumptions Don't assume that any commit we have is complete; assume that any ref we have is complete. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 September 2005, 20:19:29 UTC |
| 61420a2 | Sergey Vlasov | 14 September 2005, 12:48:05 UTC | [PATCH] Document git-fetch options Add documentation for git-fetch options Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 September 2005, 20:16:31 UTC |
| 60d0526 | Junio C Hamano | 14 September 2005, 20:15:53 UTC | Unoptimize info/refs creation. The code did not catch the case where you removed an existing ref without changing anything else. We are not talking about hundreds of refs anyway, so remove that optimization. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 September 2005, 19:46:32 UTC |
| 0f56479 | Junio C Hamano | 14 September 2005, 20:08:55 UTC | Retire info/rev-cache It was one of those things that were well intentioned but did not turn out to be useful in practice. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 September 2005, 19:46:31 UTC |
| 53764ee | Peter Eriksen | 14 September 2005, 10:41:52 UTC | [PATCH] Use '-d' as the first flag to 'install' ... in order to please Solaris 'install'. GNU install is not harmed with this. [jc: Documentation/Makefile also fixed.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 September 2005, 19:46:31 UTC |
| 1db69b5 | Sergey Vlasov | 13 September 2005, 15:38:58 UTC | [PATCH] git-http-fetch: Allow caching of retrieved objects by proxy servers By default the curl library adds "Pragma: no-cache" header to all requests, which disables caching by proxy servers. However, most files in a GIT repository are immutable, and caching them is safe and could be useful. This patch removes the "Pragma: no-cache" header from requests for all files except the pack list (objects/info/packs) and references (refs/*), which are really mutable and should not be cached. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 3b2a4c46fd5093ec79fb60e1b14b8d4a58c74612 commit) | 15 September 2005, 19:46:30 UTC |
| ba65af9 | Junio C Hamano | 14 September 2005, 08:43:53 UTC | git-branch -d <branch>: delete unused branch. The new flag '-d' lets you delete a branch. For safety, it does not lets you delete the branch you are currently on, nor a branch that has been fully merged into your current branch. The credit for the safety check idea goes to Daniel Barkalow. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 September 2005, 19:46:30 UTC |
| 19397b4 | Junio C Hamano | 14 September 2005, 21:06:50 UTC | Revert "[PATCH] plug memory leak in diff.c::diff_free_filepair()" This reverts 068eac91ce04b9aca163acb1927c3878c45d1a07 commit. | 14 September 2005, 21:06:50 UTC |
| 705a714 | Linus Torvalds | 14 September 2005, 20:41:24 UTC | [PATCH] Fix alloc_filespec() initialization This simplifies and fixes the initialization of a "diff_filespec" when allocated. The old code would not initialize "sha1_valid". Noticed by valgrind. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 September 2005, 20:57:34 UTC |
| c80522e | Junio C Hamano | 14 September 2005, 06:49:55 UTC | Make merge comment git-pull makes for an octopus a bit prettier. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 September 2005, 06:49:55 UTC |
| 4803c28 | Junio C Hamano | 14 September 2005, 05:30:13 UTC | Merge branch 'master' of . | 14 September 2005, 05:30:13 UTC |
| 2ba6c47 | Junio C Hamano | 14 September 2005, 05:27:42 UTC | read-tree: fix bogus debugging statement. We wanted to detect case #16 which should be rare, but botched the case when some paths are missing, causing a segfault. My fault. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 September 2005, 05:27:42 UTC |
| 74376a6 | Junio C Hamano | 14 September 2005, 04:09:03 UTC | git-merge-recursive: Trivial RE fixes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 September 2005, 04:09:03 UTC |
| daae669 | Fredrik Kuivinen | 13 September 2005, 21:41:39 UTC | [PATCH] Use the 'die' function where it is appropriate. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 22:45:26 UTC |
| 6511cce | Fredrik Kuivinen | 13 September 2005, 21:41:16 UTC | [PATCH] Use a temporary index file when we merge the common ancestors. With this change we can get rid of a call to 'git-update-index --refresh'. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 22:45:25 UTC |
| 87a71b6 | Fredrik Kuivinen | 13 September 2005, 21:40:47 UTC | [PATCH] Adjust git-merge-recursive.py for the new tool names. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 22:45:25 UTC |
| 0d214b6 | Fredrik Kuivinen | 13 September 2005, 21:40:23 UTC | [PATCH] Don't output 'Automatic merge failed, ...' git-merge.sh does this for us. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 22:45:24 UTC |
| d9a23fa | Fredrik Kuivinen | 13 September 2005, 21:39:34 UTC | [PATCH] Be more like the 'resolve' strategy. If there are non-mergeable changes leave the head contents in the cache and update the working directory with the output from merge(1). In the add/add and delete/modify conflict cases leave unmerged cache entries in the index. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 22:45:23 UTC |
| ccfd3e9 | Junio C Hamano | 13 September 2005, 07:05:22 UTC | [PATCH] Define relative .git/objects/info/alternates semantics. An entry in the alternates file can name a directory relative to the object store it describes. A typical linux-2.6 maintainer repository would have "../../../torvalds/linux-2.6.git/objects" there, because the subsystem maintainer object store would live in /pub/scm/linux/kernel/git/$u/$system.git/objects/ and the object store of Linus tree is in /pub/scm/linux/kernel/git/torvalds/linux-2.6.git/objects/ This unfortunately is different from GIT_ALTERNATE_OBJECT_DIRECTORIES which is relative to the cwd of the running process, but there is no way to make it consistent with the behaviour of the environment variable. The process typically is run in $system.git/ directory for a naked repository, or one level up for a repository with a working tree, so we just define it to be relative to the objects/ directory to be different from either ;-). Later, the dumb transport could be updated to read from info/alternates and make requests for the repository the repository borrows from. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 20:39:23 UTC |
| a5cd85e | Junio C Hamano | 13 September 2005, 20:16:45 UTC | Detect ls-remote failure properly. The part that can fail is before the pipe, so we need to propagate the error properly to the main process. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 20:39:06 UTC |
| e4cf17c | Fredrik Kuivinen | 13 September 2005, 06:22:26 UTC | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. Otherwise we would regret when Fredrik comes up with another merge algorithm with different pros-and-cons with the current one. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 07:20:54 UTC |
| f88ed17 | Junio C Hamano | 13 September 2005, 05:20:42 UTC | Fix off-by-one error in git-merge 'git-merge -s' without a strategy name does not fail and does not give usage as it should. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 05:52:52 UTC |
| 22c67ca | Junio C Hamano | 13 September 2005, 05:20:02 UTC | Propagate errors from fetch-pack correctly to git-fetch. When git-fetch-pack fails, the command does not notice the failure and instead pretended nothing was fetched and there was nothing wrong. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 05:52:52 UTC |
| 365527a | Junio C Hamano | 13 September 2005, 02:47:07 UTC | Fix CDPATH problem. CDPATH has two problems: * It takes scripts to unexpected places (somebody had CDPATH=..:../..:$HOME and the "cd" in git-clone.sh:get_repo_base took him to $HOME/.git when he said "clone foo bar" to clone a repository in "foo" which had "foo/.git"). CDPATH mechanism does not implicitly give "." at the beginning of CDPATH, which is the most irritating part. * The extra echo when it does its thing confuses scripts further. Most of our scripts that use "cd" includes git-sh-setup so the problem is primarily fixed there. git-clone starts without a repository, and it needs its own fix. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 05:52:51 UTC |
| 3db6b22 | Junio C Hamano | 13 September 2005, 05:02:42 UTC | Merge branch 'master' of . | 13 September 2005, 05:02:42 UTC |
| 2aba319 | Junio C Hamano | 13 September 2005, 02:39:15 UTC | Document git-grep and link it from the main git(7) page. Also adjust missing description in the git.txt page while we are at it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 02:39:15 UTC |
| 7f88c84 | Junio C Hamano | 11 September 2005, 21:12:08 UTC | [PATCH] Make 'git checkout' a bit more forgiving when switching branches. If you make a commit on a path, and then make the path cache-dirty afterwards without changing its contents, 'git checkout' to switch to another branch is prevented because switching the branches done with 'read-tree -m -u $current $next' detects that the path is cache-dirty, but it does not bother noticing that the contents of the path has not been actualy changed. Since switching branches would involve checking out paths different in the two branches, hence it is reasonably expensive operation, we can afford to run update-index before running read-tree to reduce this kind of false change from triggering the check needlessly. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 02:15:03 UTC |
| 4a5b63e | Junio C Hamano | 11 September 2005, 18:35:20 UTC | [PATCH] Omit patches that have already been merged from format-patch output. This switches the logic to pick which commits to include in the output from git-rev-list to git-cherry; as a side effect, 'format-patch ^up mine' would stop working although up..mine would continue to work. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 02:15:02 UTC |
| 663a5ed | Horst von Brand | 12 September 2005, 00:00:49 UTC | [PATCH] There are several undocumented dependencies There are several undocumented dependencies in the .spec and in the INSTALL files. The following is from Fedora, perhaps other RPM distributions call the packages differently. Also, the manpages aren't always installed gzipped. Updates to git-core.spec.in file: - Some git scripts use Perl - gitk needs wish, which is part of TCL/Tk. - curl is used all over - Need the ssh program from openssh-clients Updates to INSTALL: - Mention wish - Mention ssh Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> | 13 September 2005, 02:15:02 UTC |
| 5d9d831 | Linus Torvalds | 12 September 2005, 23:46:53 UTC | Improve "git grep" flags handling This allows any arbitrary flags to "grep", and knows about the few special grep flags that take an argument too. It also allows some flags for git-ls-files, although their usefulness is questionable. With this, something line git grep -w -1 pattern works, without the script enumerating every possible flag. [jc: this is the version Linus sent out after I showed him a barf-o-meter test version that avoids shell arrays. He must have typed this version blindly, since he said: I'm not barfing, but that's probably because my brain just shut down and is desperately trying to gouge my eyes out with a spoon. I slightly fixed it to catch the remaining arguments meant to be given git-ls-files.] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 September 2005, 02:15:02 UTC |
| 4e48fe3 | Fredrik Kuivinen | 12 September 2005, 21:31:56 UTC | [PATCH] Make the ProgramError class printable. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 September 2005, 21:54:00 UTC |
| 206e587 | Fredrik Kuivinen | 12 September 2005, 21:31:22 UTC | [PATCH] Make sure we die if we don't get enough arguments. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 September 2005, 21:53:59 UTC |
| 654291a | Fredrik Kuivinen | 12 September 2005, 21:30:47 UTC | [PATCH] Introduce a 'die' function. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 September 2005, 21:53:58 UTC |
| ace3685 | Fredrik Kuivinen | 12 September 2005, 21:29:54 UTC | [PATCH] Exit with status code 2 if we get an exception. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 September 2005, 21:53:57 UTC |
| 8ceba72 | Fredrik Kuivinen | 12 September 2005, 21:29:06 UTC | [PATCH] Fix assertion failure when merging common ancestors. Bug reported by Junio. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 September 2005, 21:53:55 UTC |
| 540bf65 | Junio C Hamano | 12 September 2005, 20:24:55 UTC | Allow finding things that begin with a dash in 'git grep' Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 September 2005, 20:24:55 UTC |
| f22cc3f | Linus Torvalds | 12 September 2005, 19:06:10 UTC | [PATCH] Add "git grep" helper Very convenient shorthand for git-ls-files [file-patterns] | xargs grep <pattern> which I tend to do all the time. Yes, it's trivial, but it's really nice. I can do git grep '\<some_variable\>' arch/i386 include/asm-i386 and it does exactly what you'd think it does. And since it just uses the normal git-ls-files file patterns, you can do things like git grep something 'include/*.h' and it will search all header files under the include/ subdirectory. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 September 2005, 20:20:03 UTC |
| ba8a497 | Linus Torvalds | 12 September 2005, 18:23:00 UTC | [PATCH] Add note about IANA confirmation The git port (9418) is officially listed by IANA now. So document it. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 September 2005, 20:19:53 UTC |
| c52b60a | Junio C Hamano | 12 September 2005, 01:58:53 UTC | Merge branch 'master' of . | 12 September 2005, 01:58:53 UTC |
| 7fa0908 | Junio C Hamano | 11 September 2005, 20:58:41 UTC | Use int instead of socklen_t This should work around the compilation problem Johannes Schindelin and others had on Mac OS/X. Quoting Linus: Any operating system where socklen_t is anything else than "int" is terminally broken. The people who introduced that typedef were confused, and I actually had to argue with them that it was fundamentally wrong: there is no other valid type than "int" that makes sense for it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 September 2005, 01:55:20 UTC |
| 65a9289 | Herbert Xu | 12 September 2005, 01:03:43 UTC | [PATCH] Apply N -> A status change in diff-helper When the git diff status 'N' was changed to 'A', diff-helper.c was not updated accordingly. This means that it no longer shows the diff for newly added files. This patch makes that change in diff-helper.c. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 September 2005, 01:53:07 UTC |
| 127bf00 | martin@catalyst.net.nz | 11 September 2005, 09:26:05 UTC | [PATCH] archimport - better handling of temp dirs Switched from backwards hard-coded tmp directory creation to using File::Temp::tempdir() to create the directory inside $TMP_PATH or what the user has provided via the -t parameter. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 17:51:57 UTC |
| 1d4710d | martin@catalyst.net.nz | 11 September 2005, 09:26:05 UTC | [PATCH] archimport - use GIT_DIR instead of hardcoded ".git" Use GIT_DIR from the environment instead of a hardcoded '.git' string. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 17:51:56 UTC |
| 241b596 | martin@catalyst.net.nz | 11 September 2005, 09:26:05 UTC | [PATCH] archimport - update in-script doco, options tidyup Updated the usage/help message to match asciidoc documentation. The perldoc documentation now includes the first paragraph from the asciidoc documentation and points users to the manpage. Updated TODO section. Removed some redundant options from the getopt() invocation. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 17:51:54 UTC |
| a5c500b | martin@catalyst.net.nz | 11 September 2005, 09:26:05 UTC | [PATCH] archimport documentation tidyup New "merges" headline, clarified some parts that were not easy to understand. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 17:51:51 UTC |
| a4c5f9a | martin@catalyst.net.nz | 11 September 2005, 09:26:05 UTC | [PATCH] archimport documentation update Updated and expanded the command description, and added a reference of the command line options. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 17:51:48 UTC |
| e1ccf53 | Yasushi SHOJI | 11 September 2005, 17:29:10 UTC | [PATCH] Escape asciidoc's built-in em-dash replacement AsciiDoc replace '--' with em-dash (—) by default. em-dash looks a lot like a single long dash and it's very confusing when we are talking about command options. Section 21.2.8 'Replacements' of AsciiDoc's User Guide says that a backslash in front of double dash prevent the replacement. This patch does just that. Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 17:51:36 UTC |
| 2c865d9 | Qingning Huo | 11 September 2005, 13:27:47 UTC | [PATCH] Fix buffer overflow in ce_flush(). Add a check before appending SHA1 signature to write_buffer, flush it first if necessary. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 17:51:13 UTC |
| 53e2cc9 | Junio C Hamano | 11 September 2005, 01:37:24 UTC | Prepare 0.99.7 release candidate branch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 02:48:09 UTC |
| 720d150 | Junio C Hamano | 11 September 2005, 00:46:27 UTC | Add a new merge strategy by Fredrik Kuivinen. I really wanted to try this out, instead of asking for an adjustment to the 'git merge' driver and waiting. For now the new strategy is called 'fredrik' and not in the list of default strategies to be tried. The script wants Python 2.4 so this commit also adjusts Debian and RPM build procecure files. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 02:46:53 UTC |
| 0f69be5 | Junio C Hamano | 09 September 2005, 08:15:47 UTC | 'git-merge': Documentation. ... and add link from git.txt, as usual. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 01:30:42 UTC |
| 2276aa6 | Junio C Hamano | 11 September 2005, 00:56:19 UTC | Use Daniel's read-tree in the merge strategy 'resolve'. And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 01:30:41 UTC |
| 91063bb | Junio C Hamano | 08 September 2005, 20:47:12 UTC | Multi-backend merge driver. The new command 'git merge' takes the current head and one or more remote heads, with the commit log message for the automated case. If the heads being merged are simple fast-forwards, it acts the same way as the current 'git resolve'. Otherwise, it tries different merge strategies and takes the result from the one that succeeded auto-merging, if there is any. If no merge strategy succeeds auto-merging, their results are evaluated for number of paths needed for hand resolving, and the one with the least number of such paths is left in the working tree. The user is asked to resolve them by hand and make a commit manually. The calling convention from the 'git merge' driver to merge strategy programs is very simple: - A strategy program is to be called 'git-merge-<strategy>'. - They take input of this form: <common1> <common2> ... '--' <head> <remote1> <remote2>... That is, one or more the common ancestors, double dash, the current head, and one or more remote heads being merged into the current branch. - Before a strategy program is called, the working tree is matched to the current <head>. - The strategy program exits with status code 0 when it successfully auto-merges the given heads. It should do update-cache for all the merged paths when it does so -- the index file will be used to record the merge result as a commit by the driver. - The strategy program exits with status code 1 when it leaves conflicts behind. It should do update-cache for all the merged paths that it successfully auto-merged, and leave the cache entry in the index file as the same as <head> for paths it could not auto-merge, and leave its best-effort result with conflict markers in the working tree when it does so. - The strategy program exists with status code other than 0 or 1 if it does not handle the given merge at all. As examples, this commit comes with merge strategies based on 'git resolve' and 'git octopus'. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 01:30:41 UTC |
| bb97a2a | Junio C Hamano | 11 September 2005, 01:14:14 UTC | Plug leak in Daniel's read-tree. ... and it is ready to be pushed out in the "master" branch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 01:27:42 UTC |
| 4d3fe0c | Junio C Hamano | 06 September 2005, 19:53:56 UTC | [PATCH] Add debugging help for case #16 to read-tree.c This will help us detect if real-world example merges have multiple merge-base candidates and one of them matches one head while another matches the other head. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 01:27:42 UTC |
| 2ab706a | Junio C Hamano | 05 September 2005, 08:13:36 UTC | [PATCH] Disable debugging from read-tree. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 01:27:42 UTC |
| 3d89cb4 | Daniel Barkalow | 05 September 2005, 06:05:17 UTC | [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 01:27:41 UTC |
| ee6566e | Daniel Barkalow | 05 September 2005, 06:04:48 UTC | [PATCH] Rewrite read-tree Adds support for multiple ancestors, removes --emu23, much simplification. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 01:27:41 UTC |
| 680bab3 | Daniel Barkalow | 05 September 2005, 06:04:18 UTC | [PATCH] Add function to append to an object_list. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 01:27:40 UTC |
| 77675e2 | Daniel Barkalow | 05 September 2005, 06:03:51 UTC | [PATCH] Add a function for getting a struct tree for an ent. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 01:27:40 UTC |
| c9d023b | Junio C Hamano | 11 September 2005, 01:24:46 UTC | Fix 'git-show-branch --list <head>' It mistakenly failed to output anything when given a single head. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 September 2005, 01:27:20 UTC |
| b595ed1 | Junio C Hamano | 10 September 2005, 22:23:09 UTC | Add 'git bisect replay/log' documentation. ... lest I get yelled at by a very angry scm ;-). Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 September 2005, 22:23:09 UTC |
| e204de2 | Junio C Hamano | 10 September 2005, 22:18:31 UTC | Keep bisection log so that it can be replayed later. The 'git bisect' command was very unforgiving in that once you made a mistake telling it good/bad it was very hard to take it back. Keep a log of what you told it in an earlier session, so that it can be replayed after removing everything after what you botched last time. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 September 2005, 22:18:31 UTC |
| 6bac10d | Junio C Hamano | 10 September 2005, 19:42:32 UTC | Fix copy marking from diffcore-rename. When (A,B) ==> (B,C) rename-copy was detected, we incorrectly said that C was created by copying B. This is because we only check if the path of rename/copy source still exists in the resulting tree to see if the file is renamed out of existence. In this case, the new B is created by copying or renaming A, so the original B is lost and we should say C is a rename of B not a copy of B. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 September 2005, 19:42:32 UTC |
