| 8d712aa | Junio C Hamano | 21 December 2005, 21:51:51 UTC | GIT 1.0.0b Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 21:51:51 UTC |
| 8ac4838 | Junio C Hamano | 21 December 2005, 21:48:47 UTC | server-info: skip empty lines. Now we allow an empty line in objects/info/packs file, recognize that and stop complaining. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 21:48:47 UTC |
| 50e7b06 | Pavel Roskin | 21 December 2005, 20:35:48 UTC | [PATCH] quote.c: Make loop control more readable. quote_c_style_counted() in quote.c uses a hard-to-read construct. Convert this to a more traditional form of the for loop. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 21:28:24 UTC |
| e4e79a2 | Junio C Hamano | 21 December 2005, 21:17:54 UTC | GIT 1.0.0a - 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> | 21 December 2005, 21:17:54 UTC |
| 6689f08 | Pavel Roskin | 21 December 2005, 20:35:48 UTC | An off-by-one bug found by valgrind Insufficient memory is allocated in index-pack.c to hold the *.idx name. One more byte should be allocated to hold the terminating 0. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 21:00:31 UTC |
| 9470657 | Johannes Schindelin | 21 December 2005, 16:53:29 UTC | Avoid misleading success message on error When a push fails (for example when the remote head does not fast forward to the desired ref) it is not correct to print "Everything up-to-date". Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 20:22:43 UTC |
| 455c161 | Junio C Hamano | 21 December 2005, 20:10:10 UTC | http-fetch.c: fix objects/info/pack parsing. It failed to register the last pack in the objects/info/packs file. Also it had an independent overrun error. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 20:13:53 UTC |
| 21b1ace | Junio C Hamano | 21 December 2005, 20:09:17 UTC | objects/info/packs: work around bug in http-fetch.c::fetch_indices() The code to fetch pack index files in deployed clients have a bug that causes it to ignore the pack file on the last line of objects/info/packs file, so append an empty line to work it around. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 20:13:52 UTC |
| c2f3bf0 | Junio C Hamano | 21 December 2005, 08:01:00 UTC | GIT 1.0.0 Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 08:01:00 UTC |
| 41f93a2 | Linus Torvalds | 21 December 2005, 02:13:02 UTC | Make "git-send-pack" less verbose by default It used to make sense to have git-send-pack talk about the things it sent when (a) it was a new program and (b) nobody had a lot of tags and branches. These days, it's just distracting to see tons of 'refs/tags/xyz': up-to-date ... when updating a remote repo. So shut it up by default, and add a "--verbose" flag for those who really want to see it. Also, since this makes he case of everything being up-to-date just totally silent, make it say "Everything up-to-date" if no refs needed updating. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 05:18:32 UTC |
| a3431fe | Junio C Hamano | 21 December 2005, 04:54:28 UTC | A shared repository should be writable by members. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 December 2005, 04:54:28 UTC |
| 4b3511b | Junio C Hamano | 20 December 2005, 22:18:47 UTC | ce_smudge_racily_clean_entry: explain why it works. This is a tricky code and warrants extra commenting. I wasted 30 minutes trying to break it until I realized why it works. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 22:18:47 UTC |
| 407c8eb | Junio C Hamano | 20 December 2005, 20:12:18 UTC | Racy GIT (part #2) The previous round caught the most trivial case well, but broke down once index file is updated again. Smudge problematic entries (they should be very few if any under normal interactive workflow) before writing a new index file out. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 20:12:18 UTC |
| 29e4d36 | Junio C Hamano | 20 December 2005, 08:02:15 UTC | Racy GIT This fixes the longstanding "Racy GIT" problem, which was pretty much there from the beginning of time, but was first demonstrated by Pasky in this message on October 24, 2005: http://marc.theaimsgroup.com/?l=git&m=113014629716878 If you run the following sequence of commands: echo frotz >infocom git update-index --add infocom echo xyzzy >infocom so that the second update to file "infocom" does not change st_mtime, what is recorded as the stat information for the cache entry "infocom" exactly matches what is on the filesystem (owner, group, inum, mtime, ctime, mode, length). After this sequence, we incorrectly think "infocom" file still has string "frotz" in it, and get really confused. E.g. git-diff-files would say there is no change, git-update-index --refresh would not even look at the filesystem to correct the situation. Some ways of working around this issue were already suggested by Linus in the same thread on the same day, including waiting until the next second before returning from update-index if a cache entry written out has the current timestamp, but that means we can make at most one commit per second, and given that the e-mail patch workflow used by Linus needs to process at least 5 commits per second, it is not an acceptable solution. Linus notes that git-apply is primarily used to update the index while processing e-mailed patches, which is true, and git-apply's up-to-date check is fooled by the same problem but luckily in the other direction, so it is not really a big issue, but still it is disturbing. The function ce_match_stat() is called to bypass the comparison against filesystem data when the stat data recorded in the cache entry matches what stat() returns from the filesystem. This patch tackles the problem by changing it to actually go to the filesystem data for cache entries that have the same mtime as the index file itself. This works as long as the index file and working tree files are on the filesystems that share the same monotonic clock. Files on network mounted filesystems sometimes get skewed timestamps compared to "date" output, but as long as working tree files' timestamps are skewed the same way as the index file's, this approach still works. The only problematic files are the ones that have the same timestamp as the index file's, because two file updates that sandwitch the index file update must happen within the same second to trigger the problem. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 08:22:28 UTC |
| a5c21d6 | Junio C Hamano | 20 December 2005, 05:55:12 UTC | format-patch: make sure header and body are separated. Since log message in a commit object is defined to be binary blob, it could be something without an empty line between the title line and the body text. Be careful to format such into a form suitable for e-mail submission. There must be an empty line between the headers and the body. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 05:55:12 UTC |
| 913419f | Junio C Hamano | 18 December 2005, 10:03:15 UTC | diff --abbrev: document --abbrev=<n> form. It was implemented there but was not advertised. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:32:44 UTC |
| 47dd0d5 | Junio C Hamano | 14 December 2005, 01:21:41 UTC | diff: --abbrev option When I show transcripts to explain how something works, I often find myself hand-editing the diff-raw output to shorten various object names in the output. This adds --abbrev option to the diff family, which shortens diff-raw output and diff-tree commit id headers. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:32:44 UTC |
| 1c15afb | Junio C Hamano | 20 December 2005, 00:18:28 UTC | xread/xwrite: do not worry about EINTR at calling sites. We had errno==EINTR check after read(2)/write(2) sprinkled all over the places, always doing continue. Consolidate them into xread()/xwrite() wrapper routines. Credits for suggestion goes to HPA -- bugs are mine. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:28:16 UTC |
| 1fdfd05 | Junio C Hamano | 20 December 2005, 02:27:04 UTC | tests: make scripts executable just for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:27:04 UTC |
| e32faa8 | Junio C Hamano | 20 December 2005, 02:03:31 UTC | Remove "octopus". 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> | 20 December 2005, 02:05:49 UTC |
| ba922cc | Junio C Hamano | 20 December 2005, 02:02:20 UTC | Remove unused cmd-rename.sh This file is a remnant from the big command rename which happened quite some time ago. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:02:20 UTC |
| d89056c | Junio C Hamano | 20 December 2005, 01:59:58 UTC | Remove generated files */*.py[co] We missed ones in the compat/ subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 02:00:54 UTC |
| 3aadad1 | Junio C Hamano | 20 December 2005, 00:35:48 UTC | Documentation: stdout of update-hook is connected to /dev/null Mention that update-hook does not emit its stdout to the sender. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 00:38:16 UTC |
| ef1cc2c | Junio C Hamano | 20 December 2005, 00:16:49 UTC | rev-list --objects: fix object list without commit. Earlier, "rev-list --objects <sha1>" for an object chain that does not have any commit failed with a usage message. This fixes "send-pack remote $tag" where tag points at a non-commit (e.g. a blob). Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 December 2005, 00:19:06 UTC |
| 42f4570 | Eric Wong | 19 December 2005, 01:23:50 UTC | Documentation/git-archimport: document -o, -a, f, -D options Also, ensure usage help switches are in the same order. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 December 2005, 09:51:16 UTC |
| 3af849a | Junio C Hamano | 19 December 2005, 08:31:08 UTC | howto/using-topic-branches: Recommend public URL git://git.kernel.org/ Recommending this means subsystem maintainers do not have to log-in just to resync with upstream. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 December 2005, 08:31:08 UTC |
| 112d0ba | Linus Torvalds | 18 December 2005, 20:41:10 UTC | Make "git help" sort git commands in columns This changes "pretty_print_string_list()" to show the git commands alphabetically in column order, which is the normal one. Ie instead of doing git commands available in '/home/torvalds/bin' ---------------------------------------------- add am ... applypatch archimport ... cat-file check-ref-format ... ... it does git commands available in '/home/torvalds/bin' ---------------------------------------------- add diff-tree ... am fetch ... apply fetch-pack ... ... where each column is sorted. This is how "ls" sorts things too, and since visually the columns are much more distinct than the rows, so it _looks_ more sorted. The "ls" command has a "-x" option that lists entries by lines (the way git.c used to): if somebody wants to do that, the new print-out logic could be easily accomodated to that too. Matter of taste and preference, I guess. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 December 2005, 21:53:40 UTC |
| ea77e67 | Linus Torvalds | 18 December 2005, 20:15:58 UTC | Make "git help" react to window size correctly Currently the git "show commands" function will react to the environment variable COLUMNS, or just default to a width of 80 characters. That's just soo eighties. Nobody sane sets COLUMNS any more, unless they need to support some stone-age software from before the age of steam engines, SIGWINCH and TIOCGWINSZ. So get with the new century, and use TIOCGWINSZ to get the terminal size. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 December 2005, 21:53:33 UTC |
| d808111 | Junio C Hamano | 18 December 2005, 20:11:27 UTC | Documentation: typos and small fixes in "everyday". Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 December 2005, 20:11:27 UTC |
| 2247efb | Junio C Hamano | 18 December 2005, 09:55:29 UTC | clone-pack: remove unused and undocumented --keep flag While we are at it, give fully spelled --keep to fetch-pack. Also give --quiet in addition to -q to fetch-pack as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 December 2005, 09:55:29 UTC |
| ad89721 | Junio C Hamano | 15 December 2005, 06:17:38 UTC | fetch-pack: -k option to keep downloaded pack. 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> | 18 December 2005, 07:11:29 UTC |
| c054d64 | Junio C Hamano | 17 December 2005, 08:00:50 UTC | Revert "get_sha1_basic(): corner case ambiguity fix" This reverts 6677c4665af2d73f670bec382bc82d0f2e9513fb commit. The misguided disambiguation has been reverted, so there is no point testing that misfeature. | 18 December 2005, 07:10:56 UTC |
| f7087e2 | Junio C Hamano | 17 December 2005, 07:48:22 UTC | Revert "We do not like "HEAD" as a new branch name" This reverts ee34518d629331dadd58b1a75294369d679eda8b commit. | 18 December 2005, 07:10:56 UTC |
| 8872f27 | Junio C Hamano | 17 December 2005, 07:48:14 UTC | Revert "refs.c: off-by-one fix." This reverts 06bf6ac4248e834a229027908d405f5e42ac96d7 commit. | 18 December 2005, 07:10:56 UTC |
| 011fbc7 | Junio C Hamano | 17 December 2005, 07:19:14 UTC | Remove misguided branch disambiguation. This removes the misguided attempt to refuse processing a branch name xyzzy and insist it to be given as either heads/xyzzy or tags/xyzzy when a tag xyzzy exists. There was no reason to do so --- the search order was predictable and well defined, so if the user says xyzzy we should have taken the tag xyzzy in such a case without complaining. This incidentally fixes another subtle bug related to this. If such a duplicate branch/tag name happened to be a unique valid prefix of an existing commit object name (say, "beef"), we did not take the tag "beef" but after complaining used the commit object whose name started with beef. Another problem this fixes while introducing some confusion is that there is no longer a reason to forbid a branch name HEAD anymore. In other words, now "git pull . ref1:HEAD" would work as expected, once we revert "We do not like HEAD branch" patch. It creates "HEAD" branch under ${GIT_DIR-.git}/refs/heads (or fast-forwards if already exists) using the tip of ref1 branch from the current repository, and merges it into the current branch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 December 2005, 07:10:56 UTC |
| 80248b2 | Junio C Hamano | 17 December 2005, 19:39:39 UTC | Documentation: HTTP needs update-server-info. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 December 2005, 19:39:39 UTC |
| 01385e2 | Junio C Hamano | 17 December 2005, 07:12:33 UTC | Comment fixes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 December 2005, 07:32:47 UTC |
| 6922471 | Jan Harkes | 17 December 2005, 06:01:06 UTC | Fix git-am --skip git-am --skip does not unpack the next patch and ends up reapplying the old patch, believing that it is the new patch in the sequence. If the old patch applied successfully it will commit it with the supposedly skipped log message and ends up dropping the following patch. If the patch did not apply the user is left with the conflict he tried to skip and has to unpack the next patch in the sequence by hand to get git-am back on track. By clearing the resume variable whenever skips bumps the sequence counter we correctly unpack the next patch. I also added another resume= in the case a patch file is missing from the sequence to avoid the same problem when a file in the sequence was removed. Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 December 2005, 06:28:19 UTC |
| 6828399 | Junio C Hamano | 16 December 2005, 02:03:59 UTC | Forbid pattern maching characters in refnames. by marking '?', '*', and '[' as bad_ref_char(). Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 December 2005, 02:23:52 UTC |
| 3ae854c | Junio C Hamano | 17 December 2005, 02:23:33 UTC | Examples of resetting. Morten Welinder says examples of resetting is really about recovering from botched commit/pulls. I agree that pointers from commands that cause a reset to be needed in the first place would be very helpful. Also reset examples did not mention "pull/merge" cases. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 December 2005, 02:23:33 UTC |
| 06bf6ac | Junio C Hamano | 16 December 2005, 02:52:51 UTC | refs.c: off-by-one fix. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 02:52:51 UTC |
| ee34518 | Johannes Schindelin | 16 December 2005, 01:40:25 UTC | We do not like "HEAD" as a new branch name This makes git-check-ref-format fail for "HEAD". Since the check is only executed when creating refs, the existing symbolic ref is safe. Otherwise these commands, most likely are pilot errors, would do pretty funky stuff: git checkout -b HEAD git pull . other:HEAD Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 01:56:32 UTC |
| 06d900c | Junio C Hamano | 16 December 2005, 01:53:44 UTC | Sort globbed refname in show-branch. "git show-branch bugs/*" shows all branches whose name match the specified pattern, but in the order readdir() happened to returned. Sort them to make the output more predictable. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 01:53:44 UTC |
| e5e3a9d | Nicolas Pitre | 15 December 2005, 16:10:32 UTC | small cleanup for diff-delta.c This patch removes unused remnants of the original xdiff source. No functional change. Possible tiny speed improvement. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 00:19:11 UTC |
| 1403959 | Fredrik Kuivinen | 15 December 2005, 22:48:38 UTC | git-whatchanged: Add usage string Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 00:02:25 UTC |
| 2a58a9a | Fredrik Kuivinen | 15 December 2005, 22:48:26 UTC | git-log: Add usage string Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 00:02:21 UTC |
| 92811b5 | Fredrik Kuivinen | 15 December 2005, 22:47:57 UTC | git-diff: Usage string clean-up Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 December 2005, 00:02:04 UTC |
| c6f60f9 | Junio C Hamano | 15 December 2005, 21:02:25 UTC | applymbox: typofix Sorry, I broke this command completely with the stupid typo. Noticed by Marco Costalba. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 21:03:20 UTC |
| 6677c46 | Junio C Hamano | 15 December 2005, 20:54:00 UTC | get_sha1_basic(): corner case ambiguity fix When .git/refs/heads/frotz and .git/refs/tags/frotz existed, and the object name stored in .git/refs/heads/frotz were corrupt, we ended up picking tags/frotz without complaining. Worse yet, if the corrupt .git/refs/heads/frotz was more than 40 bytes and began with hexadecimal characters, it silently overwritten the initial part of the returned result. This commit adds a couple of tests to demonstrate these cases, with a fix. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 20:54:00 UTC |
| 8431c4e | Junio C Hamano | 15 December 2005, 07:08:08 UTC | Documentation: tutorial At the beginning of tutorial, refer the reader to everyday if she has not done so yet. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 07:08:08 UTC |
| 988eece | Martin Langhoff | 15 December 2005, 06:26:46 UTC | svnimport: exit cleanly when we are up to date Now we detect that the SVN repo does not have new commits for us and exit cleanly, removing the lockfile. With this, svnimport supports being run on a cronjob to maintain a SVN2GIT gateway. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 06:24:46 UTC |
| 31ec6ab | Junio C Hamano | 15 December 2005, 05:25:22 UTC | clone-pack: make it usable for partial branch cloning. clone-pack had some logic to accept subset of remote refs from the command line and clone from there. However, it was never used in practice and its problems were not found out so far. This commit changes the command to output the object names of refs to the standard output instead of making a clone of the remote repository when explicit <head> parameters are given; the output format is the same as fetch-pack. The traditional behaviour of cloning the whole repository by giving no explicit <head> parameters stays the same. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 05:25:22 UTC |
| 1ed9193 | Junio C Hamano | 15 December 2005, 01:30:03 UTC | GIT 0.99.9n aka 1.0rc6 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> | 15 December 2005, 01:30:03 UTC |
| 294c695 | Amos Waterland | 14 December 2005, 22:48:19 UTC | git rebase loses author name/email if given bad email address If GIT_AUTHOR_EMAIL is of a certain form, `git rebase master' will blow away the author name and email when fast-forward merging commits. I have not tracked it down, but here is a testcase that demonstrates the behavior. Signed-off-by: Amos Waterland <apw@us.ibm.com> Acked-by: Michal Ostrowski <mostrows@watson.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 01:04:47 UTC |
| 32d9954 | Lukas Sandström | 14 December 2005, 23:36:35 UTC | Bugfixes for git-rebase Fix bugs in git-rebase wrt rebasing another branch than the current HEAD, rebasing with a dirty working dir, and rebasing a proper decendant of the target branch. [jc: with a bit of hand-merging] Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 01:02:03 UTC |
| e0e3ba2 | Junio C Hamano | 15 December 2005, 00:31:06 UTC | mailinfo and git-am: allow "John Doe <johndoe>" An isolated developer could have a local-only e-mail, which will be stripped out by mailinfo because it lacks '@'. Define a fallback parser to accomodate that. At the same time, reject authorless patch in git-am. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 December 2005, 00:31:06 UTC |
| 252fef7 | Martin Atukunda | 13 December 2005, 12:21:34 UTC | define MAXPATHLEN for hosts that don't support it [jc: Martin says syllable (www.syllable.org) wants this.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 22:26:44 UTC |
| 773b633 | Junio C Hamano | 14 December 2005, 21:32:52 UTC | Do not let errors pass by unnoticed when running `make check'. [jc: originally from Amos Waterland.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 21:32:52 UTC |
| 9a26dbd | Junio C Hamano | 14 December 2005, 21:04:43 UTC | Merge branch 'hold/am' | 14 December 2005, 21:04:43 UTC |
| 2db8aae | Junio C Hamano | 14 December 2005, 11:11:37 UTC | rebase: do not get confused in fast-forward situation. When switching to another branch and rebasing it in a one-go, it failed to update the variable that holds the branch head, and did not detect fast-forward situation correctly. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 21:04:25 UTC |
| b0d3e9b | Junio C Hamano | 14 December 2005, 21:01:01 UTC | Merge branch 'fk/usage' | 14 December 2005, 21:01:01 UTC |
| a4adf54 | Junio C Hamano | 14 December 2005, 20:57:49 UTC | Documentation: topic branches Recommend git over ssh direct to master.kernel.org, instead of going over rsync to public machines, since this is meant to be a procedure for kernel subsystem maintainers. Also fix an obvious typo. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 20:57:49 UTC |
| 5073eb0 | Junio C Hamano | 14 December 2005, 02:19:12 UTC | applypatch: no need to do non-portable [[ ... ]] ... when old, proven, case would do. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:45 UTC |
| 9678faa | freku045@student.liu.se | 13 December 2005, 22:30:32 UTC | git-repack: Usage string clean-up, emit usage at incorrect invocation Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| 3ae39ab | freku045@student.liu.se | 13 December 2005, 22:30:32 UTC | git-rebase: Usage string clean-up, emit usage string at incorrect invocation Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| 7ab099d | freku045@student.liu.se | 13 December 2005, 22:30:32 UTC | git-prune: Usage string clean-up, use the 'usage' function Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| d20e2f1 | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-lost-found: Usage string clean-up, emit usage string at incorrect invocation Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| 87358b7 | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-fetch: Usage string clean-up, emit usage string at unrecognized option Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| 43a95cf | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-cherry: Usage string clean-up, use the 'usage' function Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| 6cf6193 | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-applypatch: Usage string clean-up, emit usage string at incorrect invocation Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| cf1fe88 | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-am: Usage string clean-up Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:44 UTC |
| 4e7824b | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-revert: Usage string clean-up Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:43 UTC |
| 3497012 | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | git-verify-tag: Usage string clean-up, emit usage string at incorrect invocation Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:43 UTC |
| 806f36d | freku045@student.liu.se | 13 December 2005, 22:30:31 UTC | Trivial usage string clean-up Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:43 UTC |
| aa9dc7a | Junio C Hamano | 13 December 2005, 07:38:47 UTC | t3200: branch --help does not die anymore. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:43 UTC |
| d025524 | Fredrik Kuivinen | 11 December 2005, 09:55:49 UTC | Usage message clean-up, take #2 There were some problems with the usage message clean-up patch series. I hadn't realised that subdirectory aware scripts can't source git-sh-setup. I propose that we change this and let the scripts which are subdirectory aware set a variable, SUBDIRECTORY_OK, before they source git-sh-setup. The scripts will also set USAGE and possibly LONG_USAGE before they source git-sh-setup. If LONG_USAGE isn't set it defaults to USAGE. If we go this way it's easy to catch --help in git-sh-setup, print the (long) usage message to stdout and exit cleanly. git-sh-setup can define a 'usage' shell function which can be called by the scripts to print the short usage string to stderr and exit non-cleanly. It will also be easy to change $0 to basename $0 or something else, if would like to do that sometime in the future. What follows is a patch to convert a couple of the commands to this style. If it's ok with everyone to do it this way I will convert the rest of the scripts too. [jc: thrown in to proposed updates queue for comments.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:53:43 UTC |
| b3f041f | H. Peter Anvin | 14 December 2005, 06:39:23 UTC | git-am support for naked email messages (take 2) This allows git-am to accept single-message files as well as mboxes. Unlike the previous version, this one doesn't need to be explicitly told which one it is; rather, it looks to see if the first line is a From line and uses it to select mbox mode or not. I moved the logic to do all this into git-mailsplit, which got a new user interface as result, although the old interface is still available for backwards compatibility. [jc: applied with two obvious fixes.] Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 10:04:56 UTC |
| 01f49e3 | Junio C Hamano | 14 December 2005, 08:42:45 UTC | Everyday: a bit more examples. Talk about the following as well: * git fetch --tags * Use of "git push" as a one-man distributed development vehicle. * Show example of remotes file for pulling and pushing. * Annotate git-shell setup. * Using Carl's update hook in a CVS-style shared repository. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 08:42:45 UTC |
| f4f9ada | Junio C Hamano | 14 December 2005, 05:39:56 UTC | checkout-index: fix checking out specific path. 3bd348aeea24709cd9be4b9d741f79b6014cd7e3 commit broke checking out specific paths. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 05:39:56 UTC |
| ed24928 | Petr Baudis | 14 December 2005, 00:45:40 UTC | Make git-send-pack exit with error when some refs couldn't be pushed out In case some refs couldn't be pushed out due to an error (mostly the not-a-proper-subset error), make git-send-pack exit with non-zero status after the push is over (that is, it still tries to push out the rest of the refs). [jc: I adjusted a test for this change.] Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 02:15:02 UTC |
| 9954f5b | Junio C Hamano | 14 December 2005, 01:01:23 UTC | [PATCH] allow merging any committish Although "git-merge" is advertised as the end-user level command (instead of being a "git-pull" backend), it was not prepared to take tag objects that point at commits and barfed when fed one. Sanitize the input while we validate them, for which we already have a loop. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 December 2005, 01:01:23 UTC |
| 0a8b4de | Junio C Hamano | 13 December 2005, 23:58:00 UTC | git-clone: tell the user a bit more about clone-pack failure. When clone-pack has trouble with the remote, it dies unfriendly "EOF" error message. We cannot tell the reason why it failed from the local end; it could be that the repository did not exist, or configured not to serve over git-daemon, or a network failure. At least, saying clone-pack failed makes it a bit more meaningful. I am not convinced yet that removing the newly created directory is the right thing to do, so this commit leaves the new directory behind. Reported by Sam Ravnborg. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 23:58:00 UTC |
| 9755afb | Junio C Hamano | 13 December 2005, 10:38:24 UTC | Documentation: not learning core git commands. The initial section of tutorial was too heavy on internal workings for the first-time readers, so rewrite the introductory section of git(7) to start with "not learning core git commands" section and refer them to README to grasp the basic concepts, then Everyday to give overview with task/role oriented examples for minimum set of commands, and finally the tutorial. Also add to existing note in the tutorial that many too technical descriptions can be skipped by a casual reader. I initially started to review the tutorial, with the objective of ripping out the detailed technical information altogether, but I found that the level of details in the initial couple of sections that talk about refs and the object database in a hands-on fashion was about rigth, and left all of them there. I feel that reading about fsck-index and repack is too abstract without being aware of these directories and files. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 10:38:24 UTC |
| 803f498 | Junio C Hamano | 13 December 2005, 09:54:15 UTC | Documentation: diff examples. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 09:54:15 UTC |
| 76cead3 | Junio C Hamano | 13 December 2005, 07:55:09 UTC | Documentation: fix missing links to git(7) Also move pack protocol description to technical/. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 07:55:09 UTC |
| 1e2ccd3 | Junio C Hamano | 13 December 2005, 07:24:06 UTC | Documentation: more examples. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 07:24:06 UTC |
| 180c474 | Junio C Hamano | 13 December 2005, 02:29:53 UTC | Everyday: a bit more example. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 02:29:53 UTC |
| 0532a5e | Junio C Hamano | 13 December 2005, 01:15:55 UTC | diffcore-break: do not break too small filepair. Somehow we checked only one side and not the other. By checking the filesize upfront, we can bypass generating delta unnecessarily. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 01:15:55 UTC |
| 86c9523 | Junio C Hamano | 13 December 2005, 00:43:15 UTC | Revert "Add deltifier test." This reverts e726715a52e25d8035c89d4ea09398599610737e commit, because reverting diff-delta emptiness change would break this test. | 13 December 2005, 00:43:15 UTC |
| c7a45bd | Junio C Hamano | 13 December 2005, 00:42:38 UTC | Revert "diff-delta.c: allow delta with empty blob." This reverts 962537a3eb03a118cf27d9d0da365a3216ed1caa commit to play safe. | 13 December 2005, 00:42:38 UTC |
| 44db136 | Junio C Hamano | 13 December 2005, 00:20:21 UTC | Everyday: some examples. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 December 2005, 00:20:21 UTC |
| 962537a | Junio C Hamano | 12 December 2005, 20:01:52 UTC | diff-delta.c: allow delta with empty blob. Delta computation with an empty blob used to punt and returned NULL. This commit allows creation with empty blob; all combination of empty->empty, empty->something, and something->empty are allowed. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 December 2005, 20:57:25 UTC |
| e726715 | Junio C Hamano | 12 December 2005, 20:28:34 UTC | Add deltifier test. This test kicks in only if you built test-delta executable, and makes sure that the basic delta routine is working properly even on empty files. This commit is to make sure we have a test to catch the breakage. The delitifier code is still broken, which will be fixed with the next commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 December 2005, 20:57:25 UTC |
| d28c8af | Junio C Hamano | 12 December 2005, 20:50:40 UTC | diffcore-break.c: check diff_delta() return value. This bug caused Darrin Thompson to notice that our deltifier was half broken and punting on an empty blob. Signed-off-by: Junio C Hamano <junio@twinsun.com> | 12 December 2005, 20:57:25 UTC |
| a957207 | Junio C Hamano | 12 December 2005, 00:49:45 UTC | GIT 0.99.9m aka 1.0rc5 Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 December 2005, 00:49:45 UTC |
| b825e6f | Junio C Hamano | 11 December 2005, 20:44:46 UTC | t/t6022: a new test for renaming merge. This adds a couple of tests to cover the following renaming merge cases: - one side renames and the other side does not, with and without content conflicts. - both side rename to the same path, with and without content conflicts. The test setup also prepares a case in which both side rename to different destination, but currently the code collapses these destination paths and removes the original path, which may be wrong. The outcome of this case is not checked by the tests in this round. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 December 2005, 20:44:46 UTC |
| 157dc07 | Junio C Hamano | 11 December 2005, 09:55:52 UTC | merge-recursive: cleanup setIndexStages Fredrik points out there is a useful wrapper runProgram() used everywhere that we can use to feed input into subprocess. Use it to catch errors from the subprocess; it is a good cleanup as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 December 2005, 09:55:52 UTC |
| 28e77a8 | Junio C Hamano | 11 December 2005, 06:05:01 UTC | merge-recursive: leave unmerged entries in the index. This does two things. - When one branch renamed and the other branch did not, the resulting half-merged file in the working tree used to swap branches around and showed as if renaming side was "ours". This was confusing and inconsistent (even though the conflict markers were marked with branch names, it was not a good enough excuse). This changes the order of arguments to mergeFile in such a case to make sure we always see "our" change between <<< and ===, and "their" change between === and >>>. - When both branches renamed to the same path, and when one branch renamed and the other branch did not, we attempt mergeFile. When this automerge conflicted, we used to collapse the index. Now we use update-index --index-info to inject higher stage entries to leave the index in unmerged state for these two cases. What this still does _not_ do is to inject unmerged state into the index when the structural changes conflict. I have not thought things through what to do in each case yet, but the cases this commit cover are the most common ones, so this would be a good start. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 December 2005, 09:47:15 UTC |
| 7564577 | Junio C Hamano | 11 December 2005, 06:22:35 UTC | format-patch: use same number of digits in numbers This would help sorting by subject in MUA work saner even though MUA is too dumb to attempt sorting numbered subjects sanely. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 December 2005, 06:22:35 UTC |
| eea4206 | Junio C Hamano | 11 December 2005, 04:55:32 UTC | t0000: catch trivial pilot errors. People seem to be getting test failure from t6021 not becuase git is faulty but because they forgot to install "merge". Check this and other trivial pilot errors in the first test. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 December 2005, 04:55:32 UTC |
