| 27dedf0 | Junio C Hamano | 17 November 2005, 05:32:44 UTC | GIT 0.99.9j aka 1.0rc3 Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 November 2005, 05:32:44 UTC |
| 60d64db | Junio C Hamano | 15 November 2005, 02:39:18 UTC | GIT 0.99.9i aka 1.0rc2 Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2005, 02:39:18 UTC |
| d7bba81 | Junio C Hamano | 15 November 2005, 02:15:30 UTC | Update topo-order test. The recently we updated rev-list --topo-order to show the heads in date order, but we had a test that expected to see the old behaviour. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2005, 02:15:30 UTC |
| 08db81a | Alex Riesen | 14 November 2005, 22:10:59 UTC | allow git-update-ref create refs with slashes in names Make git-update-ref create references with slashes in them. git-branch and git-checkout already support such reference names. git-branch can use git-update-ref to create the references in a more formal manner now. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2005, 01:15:32 UTC |
| 7acab8f | Nikolai Weibull | 14 November 2005, 23:20:01 UTC | Documentation nitpicking This patch fixes some small problems with the documentation. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2005, 01:15:32 UTC |
| 2db0bfb | Nikolai Weibull | 14 November 2005, 23:20:01 UTC | Document a couple of missing command-line options. This patch adds documentation to quite a few command-line options. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2005, 01:15:32 UTC |
| b2309b7 | Nikolai Weibull | 14 November 2005, 23:20:01 UTC | Document the -n command-line option to git-unpack-objects This patch documents the -n command-line option to git-unpack-objects, as it was previously undocumented. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2005, 01:15:32 UTC |
| 9add69b | Junio C Hamano | 15 November 2005, 01:15:07 UTC | apply: fix binary patch detection. The comparison to find "Binary files " string was looking at a wrong place when offset != 0. Also, we may have the full 40-byte textual sha1 on the index line; two off-by-one errors prevented it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2005, 01:15:07 UTC |
| 2ed0288 | Linus Torvalds | 14 November 2005, 18:01:26 UTC | Fix git-rev-list "date order" with --topo-order This fixes git-rev-list so that when there are multiple branches, we still sort the heads in proper approximate date order even when sorting the output topologically. This makes things like gitk --all -d work sanely and show the branches in date order (where "date order" is obviously modified by the paren-child dependency requirements of the topological sort). The trivial fix is to just build the "work" list in date order rather than inserting the new work entries at the beginning. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 November 2005, 22:16:38 UTC |
| d4072c9 | Andreas Ericsson | 14 November 2005, 16:53:42 UTC | git-branch: Mention -d and -D in man-page. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 November 2005, 22:16:37 UTC |
| b6ebac9 | Junio C Hamano | 14 November 2005, 21:50:05 UTC | Merge branch 'svnup' of http://netz.smurf.noris.de/git/git Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 November 2005, 21:50:05 UTC |
| 0f3f5e3 | Matthias Urlichs | 14 November 2005, 16:41:31 UTC | Depend on asciidoc 7 (at least). | 14 November 2005, 16:41:31 UTC |
| 1331df8 | Josef Weidendorfer | 13 November 2005, 14:08:00 UTC | Remove git-rename. git-mv does the same Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 November 2005, 08:50:18 UTC |
| b0c698a | Josef Weidendorfer | 13 November 2005, 14:03:31 UTC | Bugfix: stop if directory already exists Fix a typo: We do not want to run the directory as command, and want to terminate if the directory exists Additionally, update the usage message Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 November 2005, 08:50:17 UTC |
| 94d2331 | Junio C Hamano | 13 November 2005, 09:46:13 UTC | Separate LDFLAGS and CFLAGS. Stuffing -L flag and friends meant for the linking phase into ALL_CFLAGS is not right; honor LDFLAGS and introduce ALL_LDFLAGS to separate them out. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 November 2005, 08:26:49 UTC |
| 6d5410d | Junio C Hamano | 14 November 2005, 08:25:48 UTC | Merge branch 'svnup' of http://netz.smurf.noris.de/git/git | 14 November 2005, 08:25:48 UTC |
| 4b1ca25 | Matthias Urlichs | 14 November 2005, 07:31:00 UTC | Remove trailing slashes SVN dies a messy death when passed a path with trailing slashes. | 14 November 2005, 07:31:00 UTC |
| 0086e2c | Junio C Hamano | 13 November 2005, 10:07:02 UTC | Rename lost+found to lost-found. Because we use "lost-found" as the directory name to hold dangling object names, it is confusing to call the command git-lost+found, although it makes sense and is even cute ;-). Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 November 2005, 10:07:02 UTC |
| abacbe4 | Kai Ruemmler | 12 November 2005, 16:33:24 UTC | Fix compilation warnings in pack-redundant.c This fixes compilation warnings where "%ld" was used to print values of type size_t. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 November 2005, 10:00:36 UTC |
| ac0b86d | Junio C Hamano | 13 November 2005, 09:57:33 UTC | Debian: build-depend on libexpat-dev. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 November 2005, 09:57:33 UTC |
| ba1dbb6 | Thomas Matysik | 13 November 2005, 04:58:02 UTC | Split gitk into seperate RPM package I don't want to have to install x11-libs and all it's dependencies on my headless machines, so this patch splits gitk out of the RPM. The .deb already appears to have gitk split out. Signed-off-by: Thomas Matysik <thomas@matysik.co.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 November 2005, 09:33:26 UTC |
| 8614e92 | Thomas Matysik | 13 November 2005, 04:56:55 UTC | Add expat and expat-devel dependencies (for http-push) to RPM spec. Signed-off-by: Thomas Matysik <thomas@matysik.co.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 November 2005, 09:32:21 UTC |
| 54a9ba0 | Nick Hengeveld | 12 November 2005, 17:38:28 UTC | Fix fd leak in http-fetch Added a call to finish_request to clean up resources if the server returned a 404 and there are no alternates left to try. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 November 2005, 07:43:11 UTC |
| acc075a | Nick Hengeveld | 12 November 2005, 17:11:32 UTC | Fix for multiple alternates requests in http-fetch Stop additional alternates requests from starting if one is already in progress. This adds an optional callback which is processed after a slot has finished running. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 November 2005, 07:43:11 UTC |
| ceae78b | Matthias Urlichs | 12 November 2005, 22:15:50 UTC | debian packaging: git-cvs needs cvsps | 12 November 2005, 22:15:50 UTC |
| f7a2eb7 | Junio C Hamano | 12 November 2005, 06:37:38 UTC | GIT 0.99.9h This is GIT 1.0-rc1 in disguise. It is plausible that relatively new parts of the system still need tweaking and fixing, but that is why it is not 1.0 but rc ;-). Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 06:37:38 UTC |
| 7765e7e | Junio C Hamano | 12 November 2005, 06:28:03 UTC | Ignore built git-lost+found. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 06:28:03 UTC |
| e6bd239 | Junio C Hamano | 12 November 2005, 06:16:59 UTC | Documentation: asciidoc sources are utf-8 git-pack-redundant documentation was encoded in latin1, which caused asciidoc to barf, which expected to see utf-8. Run tcs to re-encode it in utf-8. Also just for fun try my name in Japanese in git-lost+found documentation ;-) Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 06:16:59 UTC |
| 0720365 | Junio C Hamano | 11 November 2005, 03:16:26 UTC | Rename .git/lost+found to .git/lost-found. Just to avoid confusion that scripts poorly written by somebody else ;-) might mistake this as a mount point, or backup tools ignoring the directory. The latter is probably not a big loss, however, considering that this directory's contents are to be used while fresh anyway. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:52:21 UTC |
| 04e7ca1 | Junio C Hamano | 07 November 2005, 23:15:34 UTC | git-lost+found This command helps you resurrect accidentally lost tags and commits. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:52:20 UTC |
| d7b1a1d | Junio C Hamano | 11 November 2005, 18:41:53 UTC | git-prune: prune redundant packs Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:19:11 UTC |
| 1c3039e | Lukas_Sandström | 11 November 2005, 00:25:04 UTC | Make git-pack-redundant consider alt-odbs This patch changes git-pack-redundant so that packfiles in alternate object directories also are considered when deciding which objects are redundant. This functionality is controlled by the flag '--alt-odb'. Also convert the other flags to the long form, and update docs and git-repack accordingly. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:19:11 UTC |
| 9bc0f32 | Lukas_Sandström | 09 November 2005, 23:16:13 UTC | Rename git-pack-intersect to git-pack-redundant This patch renames git-pack-intersect to git-pack-redundant as suggested by Petr Baudis. The new name reflects what the program does, rather than how it does it. Also fix a small argument parsing bug. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:19:11 UTC |
| b4ad355 | Lukas_Sandström | 09 November 2005, 01:25:48 UTC | Make git-repack use git-pack-intersect. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:19:11 UTC |
| 5231148 | Lukas_Sandström | 09 November 2005, 01:24:51 UTC | Add git-pack-intersect to .gitignore Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:19:10 UTC |
| 2a44478 | Lukas_Sandström | 09 November 2005, 01:23:55 UTC | Add documentation for git-pack-intersect Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:19:10 UTC |
| c283ab2 | Lukas_Sandström | 09 November 2005, 01:22:40 UTC | Add git-pack-intersect This patch adds the program git-pack-intersect. It is used to find redundant packs in git repositories. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:19:10 UTC |
| fd66dbf | Junio C Hamano | 11 November 2005, 03:30:23 UTC | merge-one-file: use empty- or common-base condintionally in two-stage merge. If two sides added the same path completely different thing, it is easier to see the merge pivoting on /dev/null. So check the size of the common section we have found, and empty it if it is too small. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:18:18 UTC |
| e433705 | Junio C Hamano | 10 November 2005, 04:53:54 UTC | Documentation: git-apply --no-add This is a specialized hack to help no-base merges, but other people might find it useful, so let's document it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:18:18 UTC |
| cb93c19 | Junio C Hamano | 10 November 2005, 04:38:33 UTC | merge-one-file: use common as base, instead of emptiness. Unlike the previous round that merged the path added differently in each branches using emptiness as the base, compute a common version and use it as input to 'merge' program. This would show the resulting (still conflicting) file left in the working tree as: common file contents... <<<<<< FILENAME version from our branch... ====== version from their branch... >>>>>> .merge_file_XXXXXX more common file contents... when both sides added similar contents. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:18:17 UTC |
| f7d24bb | Junio C Hamano | 08 November 2005, 06:03:46 UTC | merge with /dev/null as base, instead of punting O==empty case Instead of leaving the path unmerged in a case where each side adds different version of the same path, attempt to merge it with empty base and leave "our" version in the index file, just like we do for the case in conflicting merge. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:18:17 UTC |
| 6fd72e3 | Petr Baudis | 12 November 2005, 00:49:59 UTC | Show URL in the "Getting <foo> list" http-fetch messages Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:14:46 UTC |
| e9af60c | Fredrik Kuivinen | 11 November 2005, 23:55:36 UTC | merge-recursive: Use '~' instead of '_' to separate file names from branch names Makes it less probable that we get a clash with an existing file, furthermore Cogito already uses '~' for this purpose. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:14:39 UTC |
| 857f26d | Fredrik Kuivinen | 11 November 2005, 23:54:55 UTC | merge-recursive: Add copyright notice Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:14:36 UTC |
| 46e6517 | Fredrik Kuivinen | 11 November 2005, 23:53:07 UTC | merge-recursive: Indent the output properly If we have multiple common ancestors and have to recursively merge them then the output will be much more readable with this commit. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2005, 05:14:34 UTC |
| 5f3aa19 | Lukas_Sandström | 11 November 2005, 01:12:27 UTC | Change 'cache' to 'index' in the docs This patch makes the documentation refer to the index as index instead of cache, but some references still remain. (e.g. git-update-index.txt) Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 23:12:29 UTC |
| 3cab359 | Junio C Hamano | 11 November 2005, 19:27:03 UTC | INSTALL: duplicate python requirements from Makefile ... and refer the reader to Makefile for other things that can be tweaked. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 19:27:03 UTC |
| 631ba30 | Junio C Hamano | 11 November 2005, 18:52:59 UTC | Merge branches 'jc/sb' and 'jc/mb' | 11 November 2005, 18:52:59 UTC |
| 4bc51db | Junio C Hamano | 11 November 2005, 02:27:44 UTC | t1200: use --topo-order to keep the show-branch output stable. Because a batch-oriented script creates many commits within a second on a fast machine, show-branch output of the test results are unstable without topo-order. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 18:52:39 UTC |
| 6b209d4 | Junio C Hamano | 10 November 2005, 23:47:58 UTC | Fully detect uninteresting commits. With the change in the previous round, we are guaranteed to come up with the list of all relevant merge bases, but sometimes we do not fully mark unintersting ones due to a horizon effect. Add a phase to postprocess, so that we mark all ancestor of "interesting" commit. This also changes the default ordering of shown commits back to chronological order, and adds --topo-order flag to show them in topological order. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 18:52:38 UTC |
| 9ce7028 | Junio C Hamano | 10 November 2005, 07:36:15 UTC | git-show-branch: tighten merge-base computation. This makes the merge-base computation resistant to the pathological case discussed on the list earlier, by doing the same logic as git-merge-base. As a side effect, it breaks the command's primary function to list non-merge commit sequences, which needs to be fixed separately. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 18:52:38 UTC |
| 53de71f | Junio C Hamano | 11 November 2005, 09:00:52 UTC | Add test case for merge-base. Although it was shown that the "full contamination" was not really full during the list discussion, the series improves things without incurring extra parsing cost, and here is a test to check that. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 18:52:31 UTC |
| 9e5f4a5 | Junio C Hamano | 11 November 2005, 06:41:44 UTC | merge-base: avoid unnecessary postprocessing. When we have only one merge-base candidates in the result list, there is no point going back to mark the reachable commits again. And that is the most common case, so try not to waste time on it. Suggested by Linus. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 18:52:31 UTC |
| ed9a540 | Junio C Hamano | 11 November 2005, 01:21:54 UTC | merge-base: fully contaminate the well. The discussion on the list demonstrated a pathological case where an ancestor of a merge-base can be left interesting. This commit introduces a postprocessing phase to fix it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 18:52:30 UTC |
| 592ee97 | Junio C Hamano | 11 November 2005, 17:31:38 UTC | RPM: arch submodule needs tla. Noticed by Horst von Brand. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 17:33:47 UTC |
| 7f10f7c | Andreas Ericsson | 10 November 2005, 11:58:08 UTC | git-clone: Allow cloning into directories other than child of current dir. This patch adds -p to mkdir and an explicit check to see if the target directory exists (since mkdir -p doesn't throw an error if it does). Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 09:34:27 UTC |
| 0879aa2 | Andreas Ericsson | 10 November 2005, 11:58:08 UTC | git-clone: Keep remote names when cloning unless explicitly told not to. With this patch the following commands all clone into the local directory "repo". If repo exists, it will still barf. git-clone git://host.xz/repo.git git-clone /path/to/repo/.git git-clone host.xz:repo.git I ended up doing the same source-to-target sed'ing for all our company projects, so it was easier to add it directly to git-clone. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 09:34:26 UTC |
| 0867b01 | Chris Wright | 11 November 2005, 09:10:29 UTC | specfile cleanups Some specfile cleanups after the split. - zlib dependency fix, current method is inconsistent, you can potentially build a package that you can't install on machine you built it on - Add proper defattr - Remove trailing '.' in summary - Add docs to split up packages - Add git-core dependency for each subpackage - Move arch import to separate package as well Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 09:24:31 UTC |
| f84f9d3 | Martin Langhoff | 11 November 2005, 05:00:57 UTC | archimport: handle pika escaping Arch uses pika escaping in some places (but not all!). Specifically, commits of the type 'patch' use pika escaping in the log entries, which we parse to know what to add/delete and what to commit. This patch checks for hints of pika escaping and asks tla to unescape for us. Originally implemented by Penny Leach <penny@catalyst.net.nz> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 09:15:26 UTC |
| 0e9ab02 | Pavel Roskin | 11 November 2005, 05:19:04 UTC | git-clone: quote destination directory name git-clone doesn't quote the full path to the destination directory, which causes it to fail if the path contains spaces or other characters interpreted by the shell. [jc: obviously I was not careful enough. Pavel, thanks for catching.] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 09:15:00 UTC |
| 601c978 | Pavel Roskin | 10 November 2005, 05:30:12 UTC | Add --no-commit-id option for git-diff-tree, use it in gitk This patch introduces -no-commit-id option for git-diff-tree, which suppresses commit ID output. [jc: dropped gitk part for now.] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 09:13:05 UTC |
| 17cf939 | Junio C Hamano | 10 November 2005, 06:37:14 UTC | octopus: do not do AND'ed merge base. When doing an octopus, we incorrectly used the previous merge base as the reference to compute next merge base. This was unnecessary, because that can never be better than using the original HEAD. And that is far simpler as well ;-). Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 08:50:24 UTC |
| ff56fe1 | Junio C Hamano | 10 November 2005, 06:15:27 UTC | Add --pretty=fuller git log without --pretty showed author and author-date, while with --pretty=full showed author and committer but no dates. The new formatting option, --pretty=fuller, shows both name and timestamp for author and committer. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 08:42:52 UTC |
| e3e291f | Junio C Hamano | 11 November 2005, 07:34:08 UTC | Do not lose author name information to locale gotchas. I noticed format-patch loses authorship information of Lukas' patch when I run git tools with LC_LANG set to ja_JP. It turns out that the sed script to set environment variables were not working on his name (encoded in UTF-8), which is unfortunate but technically correct. Force sed invocation under C locale because we always want literal byte semantics. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 08:37:34 UTC |
| 605607c | Junio C Hamano | 11 November 2005, 01:46:20 UTC | Documentation: "host:path/to/repo" is git native over ssh. You could also spell it ssh://host:/path/to/repo (or git+ssh, ssh+git), but without method:// is shorter to type, so mention only that one in the short and sweet list. Noticed by Pasky. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2005, 08:37:34 UTC |
| 66c9ec2 | Josef Weidendorfer | 10 November 2005, 13:12:19 UTC | Let git-clone/git-fetch follow HTTP redirections Otherwise, git-clone silently failed to clone a remote repository where redirections (ie. a response with a "Location" header line) are used. This includes the fixes from Nick Hengeveld. Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 November 2005, 23:57:56 UTC |
| ad7db62 | Petr Baudis | 10 November 2005, 19:55:13 UTC | Fix confusing git-update-ref error message When git-update-ref has hit the "Ref %s changed to %s" error, I just stare at it, left puzzled. This patch attempts to reword that to a more useful and less confusing error message. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 November 2005, 23:57:21 UTC |
| 14df4c4 | Jim Radford | 10 November 2005, 19:03:08 UTC | Add missing git-core and cvsps RPM dependencies. Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 November 2005, 23:57:09 UTC |
| 23ea3e2 | Junio C Hamano | 10 November 2005, 05:09:43 UTC | GIT 0.99.9g Another snapshot, as slow and steady marth towards 1.0 continues. Major changes include: - Jim Radford's RPM split. - Fredrik's recursive merge strategy is now default for two heads merge. - Yaacov's SVN importer updates. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 November 2005, 05:09:43 UTC |
| a1c2929 | Junio C Hamano | 08 November 2005, 10:00:31 UTC | Make git-recursive the default strategy for git-pull. This does two things: - It changes the hardcoded default merge strategy for two-head git-pull from resolve to recursive. - .git/config file acquires two configuration items. pull.twohead names the strategy for two-head case, and pull.octopus names the strategy for octopus merge. IOW you are paranoid, you can have the following lines in your .git/config file and keep using git-merge-resolve when pulling one remote: [pull] twohead = resolve OTOH, you can say this: [pull] twohead = resolve twohead = recursive to try quicker resolve first, and when it fails, fall back to recursive. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 November 2005, 02:56:29 UTC |
| 1395667 | Junio C Hamano | 10 November 2005, 02:54:14 UTC | Use 'merge-base --all' where applicable. It may get extra merge base on truly pathological commit histories, but is a lot easier to understand, explain, and prove correctness. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 November 2005, 02:54:14 UTC |
| a489352 | Junio C Hamano | 10 November 2005, 02:44:42 UTC | Merge branch 'hold/svn' | 10 November 2005, 02:44:42 UTC |
| 68afd5f | Junio C Hamano | 10 November 2005, 02:44:18 UTC | Merge branch 'hold/rpm' | 10 November 2005, 02:44:18 UTC |
| ff36de0 | Junio C Hamano | 09 November 2005, 22:59:23 UTC | git-apply: do not fail on binary diff when not applying nor checking. We run git-apply with --stat and --summary at the end of the pull by default, which causes it to barf when the pull brought in changes to binary files. Just mark them as binary patch and proceed when not applying nor checking. [jc: I almost missed --check until I saw Linus did something similar.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 23:19:50 UTC |
| c44922a | Junio C Hamano | 09 November 2005, 20:40:03 UTC | Update INSTALL Explicitly mention how to install by hand in build-as-user and install-as-root steps. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 20:40:03 UTC |
| 186f855 | Fredrik Kuivinen | 09 November 2005, 10:42:57 UTC | merge-recursive: Fix support for branch names containing slashes A branch name could have a slash in it. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 20:32:36 UTC |
| c8a4f5e | Fredrik Kuivinen | 09 November 2005, 10:36:55 UTC | merge-recursive: Fix limited output of rename messages The previous code did the right thing, but it did it by accident. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 20:32:34 UTC |
| e09f5d7 | Alexander Litvinov | 09 November 2005, 07:02:58 UTC | Fix cvsexportcommit syntax error There is a syntax error in cvsexport script: Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 07:34:29 UTC |
| f37d0cc | Luck, Tony | 08 November 2005, 23:52:02 UTC | Update howto using-topic-branches "git resolve" is being deprecated in favour of "git merge". Update the documentation to reflect this. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 05:33:36 UTC |
| f4f440a | Peter Hagervall | 08 November 2005, 22:18:31 UTC | sparse fixes for http-{fetch,push}.c Make a bunch of needlessly global functions static, and replace two K&R-style declarations. Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2005, 05:33:32 UTC |
| 61f8151 | Kai Ruemmler | 08 November 2005, 10:44:33 UTC | git-tag -d <tag>: delete tag <tag> This adds option '-d' to git-tag.sh and documents it. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 19:26:10 UTC |
| 23fc63b | Alex Riesen | 08 November 2005, 09:51:10 UTC | make tests ignorable with "make -i" Allow failed tests to be ignored using make's "-i". The patch also disables parallel make in t/. This doesn't make the testing any different as before: the tests were run sequentially before. It also allows to run more tests, ignoring the ones usually failing just to figure out if something else broke. (Or to ignore plainly uninteresting situations because of the testing being done on say... cygwin ;) Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 19:26:07 UTC |
| cb34882 | Alex Riesen | 08 November 2005, 10:45:15 UTC | fix t5000-tar-tree.sh when $TAR isn't set $TAR isn't set everywhere. Provide a default (tar) Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 19:26:03 UTC |
| f8d294f | Junio C Hamano | 08 November 2005, 16:58:52 UTC | Clean build annoyance. As Pasky pointed out, building in templates directory showed list of built template files which was unneeded. This commit also fixes another build annoyance I recently left in by accident. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 16:58:52 UTC |
| 5ca15b8 | Junio C Hamano | 08 November 2005, 09:25:59 UTC | GIT 0.99.9f Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:25:59 UTC |
| 7d4de59 | Jim Radford | 05 November 2005, 19:38:02 UTC | Separate RPMS for programs with non-standard dependencies. Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:54 UTC |
| f3ad062 | Junio C Hamano | 05 November 2005, 07:30:12 UTC | Fix a couple of obvious and insignificant typo. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:50 UTC |
| 01d4f0e | Yaacov Akiba Slama | 02 November 2005, 21:51:58 UTC | Lift the default limit of number of revs. Now that the leak is gone, there is by default no limit of revisions to import. No more message about leak when the limit (given by the -l parameter) is reached. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:50 UTC |
| a16db4f | Yaacov Akiba Slama | 02 November 2005, 21:51:57 UTC | Handle a revision that only creates a new tag correctly. Fix an error when a svn revision consists only of the creation of a new tag directory (/tags/this_is_a_tag). Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:49 UTC |
| 109fc2b | Yaacov Akiba Slama | 02 November 2005, 21:51:57 UTC | Bundle file copies from multiple branches into a merge. When copying files and/or directories from several branches in one single revision, all these branches are used as parents of the commit. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:49 UTC |
| 8168373 | Yaacov Akiba Slama | 02 November 2005, 21:51:57 UTC | copy_dir becomes copy_path and handles both files and directories The A (Add) and R (Replace) actions handling are unified. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:48 UTC |
| c2c07a5 | Yaacov Akiba Slama | 02 November 2005, 21:51:57 UTC | Don't output error on changes in the nodes /, /tags or /branches Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:48 UTC |
| cbce5d8 | Yaacov Akiba Slama | 02 November 2005, 21:51:57 UTC | Add node_kind function to differentiate between file and directory Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:48 UTC |
| fcfa32b | Yaacov Akiba Slama | 02 November 2005, 21:51:57 UTC | Use svn pools to solve the memory leak problem. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:24:47 UTC |
| 4bfb6b6 | Junio C Hamano | 08 November 2005, 08:41:37 UTC | git-am: do not lose already edited final-commit when resuming. The last round stopped munging the patch when resuming, but failed to preserve final-commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:23:53 UTC |
| 39b4ac9 | Alex Riesen | 08 November 2005, 08:23:37 UTC | ls-files and read-tree need core.filemode ls-files.c and read-tree.c miss the default configuration, in particular the filemode=false part. The recent +x bit flip made me notice that, because git-merge refused to merge anything saying that git-pull.sh is not up to date. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:23:52 UTC |
| 76bca9d | Junio C Hamano | 08 November 2005, 09:20:24 UTC | Debian: packaging updates. Do not scatter txt and html documentation into feature subpackages. Do place man pages into them. Capture more cvs stuff into git-cvs package. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 09:20:24 UTC |
| f2416c2 | Jon Loeliger | 07 November 2005, 14:33:51 UTC | Use consistent shell prompts and example style. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 08:23:13 UTC |
| d0fde47 | Jon Loeliger | 07 November 2005, 14:03:30 UTC | Add --tags documentation, scraped from JC mail. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 08:23:12 UTC |
| df8171c | Nick Hengeveld | 02 November 2005, 19:19:31 UTC | Add support for git-http-push to git-push script Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2005, 08:23:12 UTC |
