| 91dd674 | Junio C Hamano | 02 October 2005, 19:56:31 UTC | GIT 0.99.8 GIT already did everything I wanted it to do since mid 0.99.7, and it has almost everything I want it to have now, except a couple of minor tweaks and enhancements. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 23:07:29 UTC |
| a2775c2 | Eric W. Biederman | 02 October 2005, 19:42:57 UTC | [PATCH] Update git-clone documentation The documentation for git-clone is behind the actual command. I have been getting tired of reading the shell script to see what the arguments are so here is an update of the actual documentation. Signed-off-by: Eric Biederman <ebiederman@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 23:06:08 UTC |
| f9d7241 | Junio C Hamano | 02 October 2005, 18:13:44 UTC | Handle really trivial case inside git-merge. Using Linus' --trivial option, this handles really trivial case inside git-merge itself, without using any strategy modules. A 'really trivial case' is: - we are merging one branch into the current branch; - there is only one merge base between the branches; - there is no file-level merge required. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 18:13:44 UTC |
| 23822a3 | Linus Torvalds | 29 September 2005, 15:16:12 UTC | read-tree: --trivial This adds an option --trivial to restrict 3-way 'read-tree -m -u' to happen only if there is no file-level merging required. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 17:42:46 UTC |
| 500b97e | Fredrik Kuivinen | 02 October 2005, 15:33:38 UTC | [PATCH] Teach git-ls-files about '--' to denote end of options. Useful if you have a file whose name starts with a dash. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 17:31:18 UTC |
| af21511 | Fredrik Kuivinen | 02 October 2005, 15:43:07 UTC | [PATCH] Teach the recursive merge strategy about renames. It will now merge cases where a file was renamed in one branch and modified in the other branch cleanly. We also detect a couple of conflict cases now that wasn't detected before. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 17:03:00 UTC |
| 7dd4357 | Junio C Hamano | 02 October 2005, 07:50:16 UTC | read-tree: remove --head option. Initially it was to allow specifying more than one remote to allow creation of an Octopus, but it is not being used. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 07:50:16 UTC |
| 0842acf | Junio C Hamano | 02 October 2005, 07:20:45 UTC | Customize git command for installations that lack certain commands. When the platform lacks certain git subcommands, omit them from the list of subcommands that are available from "git" wrapper. Noticed by Geert Bosch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 07:20:45 UTC |
| 18c5a52 | Han Boetes | 01 October 2005, 06:23:26 UTC | [PATCH] git on OpenBSD iconv is installed in /usr/local. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 07:00:53 UTC |
| 5cd5ace | Linus Torvalds | 01 October 2005, 20:39:47 UTC | [PATCH] Re-instate index file write optimization This makes "git-update-index" avoid the new index file write if it didn't make any changes to the index. It still doesn't make things like "git status" be read-only operations in general, but if the index file doesn't need refreshing, it now will at least avoid making unnecessary changes. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:56:16 UTC |
| 5d1a5c0 | Linus Torvalds | 01 October 2005, 20:24:27 UTC | [PATCH] Better error reporting for "git status" Instead of "git status" ignoring (and hiding) potential errors from the "git-update-index" call, make it exit if it fails, and show the error. In order to do this, use the "-q" flag (to ignore not-up-to-date files) and add a new "--unmerged" flag that allows unmerged entries in the index without any errors. This also avoids marking the index "changed" if an entry isn't actually modified, and makes sure that we exit with an understandable error message if the index is corrupt or unreadable. "read_cache()" no longer returns an error for the caller to check. Finally, make die() and usage() exit with recognizable error codes, if we ever want to check the failure reason in scripts. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:55:47 UTC |
| 455a7f3 | Junio C Hamano | 30 September 2005, 20:31:16 UTC | More portability. - The location of openssl development files got customizable. - The location of iconv development files got customizable. - Pass $TAR down to t5000 test so that the user can override with 'gmake TAR=gtar'. - Solaris 'bc' does not seem to grok "define abs()". There is no reason to use bc there -- expr would do. Signed-off-by: Junio C Hamano <junio@twinsun.com> | 02 October 2005, 06:19:48 UTC |
| 8098a17 | Junio C Hamano | 30 September 2005, 21:26:57 UTC | Add git-symbolic-ref This adds the counterpart of git-update-ref that lets you read and create "symbolic refs". By default it uses a symbolic link to represent ".git/HEAD -> refs/heads/master", but it can be compiled to use the textfile symbolic ref. The places that did 'readlink .git/HEAD' and 'ln -s refs/heads/blah .git/HEAD' have been converted to use new git-symbolic-ref command, so that they can deal with either implementation. Signed-off-by: Junio C Hamano <junio@twinsun.com> | 02 October 2005, 06:19:33 UTC |
| a876ed8 | Junio C Hamano | 30 September 2005, 21:08:25 UTC | Use resolve_ref() to implement read_ref(). Symbolic refs are understood by resolve_ref(), so existing read_ref() users will automatically understand them as well. Signed-off-by: Junio C Hamano <junio@twinsun.com> | 02 October 2005, 06:19:33 UTC |
| ca8db14 | Linus Torvalds | 25 September 2005, 16:59:37 UTC | [PATCH] Allow reading "symbolic refs" that point to other refs This extends the ref reading to understand a "symbolic ref": a ref file that starts with "ref: " and points to another ref file, and thus introduces the notion of ref aliases. This is in preparation of allowing HEAD to eventually not be a symlink, but one of these symbolic refs instead. [jc: Linus originally required the prefix to be "ref: " five bytes and nothing else, but I changed it to allow and strip any number of leading whitespaces to match what update-ref.c does.] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:19:32 UTC |
| 9b143c6 | Junio C Hamano | 26 September 2005, 02:30:24 UTC | Teach update-ref about a symbolic ref stored in a textfile. A symbolic ref is a regular file whose contents is "ref:", followed by optional leading whitespaces, followed by a GIT_DIR relative pathname, followed by optional trailing whitespaces (the optional whitespaces are unconditionally removed, so you cannot have leading nor trailing whitespaces). This can be used in place of a traditional symbolic link .git/HEAD that usually points at "refs/heads/master". You can instead have a regular file .git/HEAD whose contents is "ref: refs/heads/master". [jc: currently the code does not enforce the symbolic ref to begin with refs/, unlike the symbolic link case. It may be worthwhile to require either case to begin with refs/ and not have any /./ nor /../ in them.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:19:32 UTC |
| ed1aadf | Linus Torvalds | 29 September 2005, 21:35:15 UTC | [PATCH] git fetch --tags You can do git fetch --tags <linus-kernel-repo> and it should fetch all my tags automatically. [jc: The original by Linus fetched and overwrote branch heads with --all, which felt dangerous and wrong, so I removed it. Also this version does not use any refs that resulted as --tags for later merge. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:18:38 UTC |
| 4fa2197 | Nick Hengeveld | 30 September 2005, 23:27:47 UTC | [PATCH] HTTP partial transfer support fix. Don't unlink the temp file when an object transfer fails, so next attempt will pick up where the failed transfer left off Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:17:15 UTC |
| 271421c | Junio C Hamano | 30 September 2005, 07:07:39 UTC | Update partial HTTP transfers. Add the sanity checks discussed on the list with Nick Hengeveld in <20050927000931.GA15615@reactrix.com>. * unlink of previous and rename from temp to previous can fail for reasons other than benign ones (missing previous and missing temp). Report these failures when we encounter them, to make diagnosing problems easier. * when rewinding the partially written result, make sure to truncate the file. Also verify the pack after downloading by calling verify_packfile(). Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:17:14 UTC |
| 49a0f24 | Nick Hengeveld | 28 September 2005, 17:14:04 UTC | [PATCH] HTTP partial transfer support for object, pack, and index transfers HTTP partial transfer support for object, pack, and index transfers [jc: this should not be placed in "master" -- it does not have any fixes requested on the list.] Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:17:14 UTC |
| 94c2334 | Junio C Hamano | 30 September 2005, 08:48:57 UTC | Pass CVSps generated A U Thor <author@domain.xz> intact. Alexey Nezhdanov updated CVSps to generate author-name and author-email information in its output. If the input looks like it has that already properly formatted, use that without our own munging. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:15:23 UTC |
| 37f15d5 | Martin Langhoff | 30 September 2005, 07:15:12 UTC | [PATCH] archimport: Actually cope with merges from "remote" repositories. Plus: Nicer messages. archimport was refusing to import commits that had merges from repositories that it didn't know about. Fixed. Also brings in nicer messages. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:14:48 UTC |
| 38ec15a | Junio C Hamano | 01 October 2005, 19:01:07 UTC | Honor extractor's umask in git-tar-tree. The archive generated with git-tar-tree had 0755 and 0644 mode bits. This inconvenienced the extractor with umask 002 by robbing g+w bit unconditionally. Just write it out with loose permissions bits and let the umask of the extractor do its job. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2005, 06:14:06 UTC |
| f8d839a | Junio C Hamano | 01 October 2005, 18:58:43 UTC | Honor user's umask. Fix the last two holdouts that forced mode bits stricter than the user's umask. Noticed by Wolfgang Denk and fixed by Linus. [jc: applied the same fix to mailsplit just for the sake of consistency.] Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 October 2005, 18:58:43 UTC |
| 1fea629 | Linus Torvalds | 01 October 2005, 06:25:23 UTC | [PATCH] Flag empty patches as errors A patch that contains no actual diff, and that doesn't change any meta-data is bad. It shouldn't be a patch at all, and git-apply shouldn't just accept it. This caused a corrupted patch to be silently applied as an empty change in the kernel, because the corruption ended up making the patch look empty. An example of such a patch is one that contains the patch header, but where the initial fragment header (the "@@ -nr,.." line) is missing, causing us to not parse any fragments. The real "patch" program will also flag such patches as bad, with the message patch: **** Only garbage was found in the patch input. and we should do likewise. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 October 2005, 06:52:48 UTC |
| 88cd621 | Junio C Hamano | 30 September 2005, 21:02:47 UTC | Consolidate null_sha1[]. Signed-off-by: Junio C Hamano <junio@twinsun.com> | 01 October 2005, 05:12:01 UTC |
| 894a8a8 | Junio C Hamano | 30 September 2005, 07:27:11 UTC | Still installing the old command names. After seeing Jeff's guide, I changed my mind about the big-rename transition plan. Even if Porcelains are kept up to date, those web documents that describes older world order would live longer and people will stumble across them via google searches. And who knows how many mirrored copies there are. The backward compatible symbolic links *will* be removed before 1.0. But that will not happen in 0.99.8. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 September 2005, 07:27:11 UTC |
| 264b16b | Junio C Hamano | 30 September 2005, 07:09:04 UTC | Tell which packfile is corrupt when we die. The core part detected and died upon seeing a corrupted packfile, but did not help the user by telling which packfile is corrupt and how. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 September 2005, 07:09:04 UTC |
| cdda474 | Pavel Roskin | 29 September 2005, 20:53:14 UTC | [PATCH] Make logerror() and loginfo() static Make logerror() and loginfo() static logerror() and loginfo() in daemon.c are never declared and never called from other files, therefore they should be declared static. Found by sparse. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 September 2005, 05:47:40 UTC |
| 7d167fe | Johannes Schindelin | 29 September 2005, 16:19:50 UTC | [PATCH] Old curl does not know about CURLOPT_SSLKEY ... so try to set it only in later versions. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 September 2005, 05:47:37 UTC |
| 60fb5b2 | Junio C Hamano | 26 September 2005, 02:43:51 UTC | Use git-merge in git-pull (second try). This again makes git-pull to use git-merge, so that different merge strategy can be specified from the command line. Without explicit strategy parameter, it defaults to git-merge-resolve if only one remote is pulled, and git-merge-octopus otherwise, to keep the default behaviour of the command the same as the original. Also this brings another usability measure: -n flag from the command line, if given, is passed to git-merge to prevent it from running the diffstat at the end of the merge. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2005, 07:24:41 UTC |
| bf7960e | Junio C Hamano | 28 September 2005, 01:14:27 UTC | Use git-update-ref in scripts. This uses the git-update-ref command in scripts for safer updates. Also places where we used to read HEAD ref by using "cat" were fixed to use git-rev-parse. This will matter when we start using symbolic references. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2005, 23:42:44 UTC |
| a7928f8 | Peter Hagervall | 28 September 2005, 12:04:54 UTC | [PATCH] Make some needlessly global stuff static Insert 'static' where appropriate. Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2005, 23:38:52 UTC |
| 5acb6de | Nick Hengeveld | 27 September 2005, 17:45:27 UTC | [PATCH] Support for more CURL SSL settings via environment variables Added support for additional CURL SSL settings via environment variables. Client certificate/key files can be specified as well as alternate CA information. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2005, 23:38:51 UTC |
| 49c188f | Tom Prince | 27 September 2005, 07:06:05 UTC | [PATCH] Add new programs to .gitignore. Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2005, 23:38:50 UTC |
| 60fa056 | Junio C Hamano | 28 September 2005, 23:29:11 UTC | Fastpath the normal case by not checking that index matches HEAD. The merge strategy would check this itself and typically does it by using git-read-tree -m -u 3-way merge. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2005, 23:29:11 UTC |
| 05dd8e2 | Junio C Hamano | 26 September 2005, 05:54:23 UTC | Fix default pull not to do an unintended Octopus. The refspecs specified in the .git/remotes/<remote> on the "Pull: " lines are for fetching multiple heads in one go, but most of the time making an Octopus out of them is not what is wanted. Make git-fetch leave the marker in .git/FETCH_HEAD file so that later stages can tell which heads are for merging and which are not. Tom Prince made me realize how stupid the original behaviour was. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2005, 23:22:00 UTC |
| 3e03aaf | Junio C Hamano | 28 September 2005, 19:56:18 UTC | Update the case table in t/t1000. It still talked about "the proposed alternative semantics" but we have used those alternative semantics for quite some time. Update them to avoid confusion. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2005, 19:56:18 UTC |
| d710b26 | Junio C Hamano | 28 September 2005, 00:05:41 UTC | Merge master.kernel.org:/home/hpa/git/daemon | 28 September 2005, 00:05:41 UTC |
| 148ccbb | Junio C Hamano | 27 September 2005, 01:13:53 UTC | git-commit: use update-index --stdin, instead of xargs. Now update-index supports '-z --stdin', we do not have to rely on platform xargs to support -0 option. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 23:59:45 UTC |
| 1f7f99d | Junio C Hamano | 27 September 2005, 01:13:32 UTC | update-index: document --stdin and -z Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 23:59:45 UTC |
| ee1bec3 | Junio C Hamano | 27 September 2005, 01:13:08 UTC | update-index: --stdin and -z The new option --stdin reads list of paths to be updated from the standard input. As usual, -z means the paths are terminated with NUL characters, as opposed to LF without that option. This is useful to use git-diff-files -z and git-ls-files -z when the platform xargs does not support -0 option, and obviously saves one process even when xargs can take -0. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 23:59:44 UTC |
| e8f71fc | H. Peter Anvin | 27 September 2005, 16:02:24 UTC | COPTS -> CFLAGS | 27 September 2005, 16:02:24 UTC |
| 8fc7ba8 | H. Peter Anvin | 27 September 2005, 16:01:08 UTC | Parallelize the build | 27 September 2005, 16:01:08 UTC |
| 07cdbb3 | H. Peter Anvin | 27 September 2005, 15:50:08 UTC | Merge with git+ssh://master.kernel.org/pub/scm/git/git.git | 27 September 2005, 15:50:08 UTC |
| 47888f0 | H. Peter Anvin | 27 September 2005, 15:49:40 UTC | Restore chdir(".git") | 27 September 2005, 15:49:40 UTC |
| 1ddea77 | Nick Hengeveld | 26 September 2005, 17:52:11 UTC | [PATCH] Return CURL error message when object transfer fails Return CURL error message when object transfer fails [jc: added similar curl_errorstr errors to places where we use curl_easy_perform() to run fetch that _must_ succeed.] Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 07:19:18 UTC |
| 820eca6 | Daniel Barkalow | 27 September 2005, 01:38:08 UTC | [PATCH] Implement --recover for git-*-fetch With the --recover option, we verify that we have absolutely everything reachable from the target, not assuming that things reachable from refs will be complete. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 07:16:40 UTC |
| 5da1606 | Sven Verdoolaege | 26 September 2005, 20:54:01 UTC | [PATCH] Provide access to git_dir through get_git_dir(). Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 07:16:39 UTC |
| edde7a8 | Peter Eriksen | 24 September 2005, 19:50:29 UTC | [PATCH] Make the test more shell generic and fix missing Solaris find option This is from Peter Eriksen, but further fixed. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 07:16:39 UTC |
| 3cc35e2 | Junio C Hamano | 27 September 2005, 07:15:45 UTC | Really require tk 8.4 (RPM) **BLUSH** Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 07:15:45 UTC |
| 4ae9568 | H. Peter Anvin | 27 September 2005, 02:10:55 UTC | Support a modicum of path validation, and allow an export all trees option. | 27 September 2005, 02:10:55 UTC |
| 1e1cba6 | Junio C Hamano | 27 September 2005, 01:29:26 UTC | Require tk 8.4 (RPM) Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 01:29:26 UTC |
| c106705 | Junio C Hamano | 27 September 2005, 01:23:47 UTC | Merge http://www.kernel.org/pub/scm/gitk/gitk | 27 September 2005, 01:23:47 UTC |
| 0b7a9fc | Junio C Hamano | 26 September 2005, 02:49:49 UTC | git-fetch: send informational output to >&2 consistently. Only the "Fetching ... using http" was leaking to stdout. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 01:04:17 UTC |
| deca7e8 | Junio C Hamano | 25 September 2005, 07:12:06 UTC | Give default merge message after failed automerge. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 01:04:17 UTC |
| e2f5f6e | Junio C Hamano | 25 September 2005, 05:52:32 UTC | Do not require clean tree when reverting and cherry-picking. My stupidity deserved to be yelled at by Linus ... there is no reason to require the working tree to be clean when merging -- the only requirements are index to match HEAD commit and the paths involved in merge are up to date in the working tree. Revert and cherry-pick are just specialized forms of merge, and the requirements should be the same. Remove the 'general purpose routine to make sure tree is clean' from git-sh-setup, to prevent me from getting tempted again. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 01:04:17 UTC |
| a935824 | Junio C Hamano | 23 September 2005, 07:43:04 UTC | Fix overzealous cleanliness check in git-merge Being able to try multiple strategies and automatically picking one that seems to give less conflicting result may or may not much sense in practice. At least that should not force normal use case to additionally require the working tree to be fully clean. As Linus shouted, local changes do not matter unless they interfere with the merge. This commit changes git-merge not to require a clean working tree. Only when we will iterate through more than one merge strategies, local changes are stashed away before trying the first merge, and restored before second and later merges are attempted. The index file must be in sync with HEAD in any case -- otherwise the merge result would contain changes since HEAD that was done locally and registered in the index. This check is already enforced by three-way read-tree existing merge strategies use, but is done here as a safeguard as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 01:04:17 UTC |
| 036a72d | Junio C Hamano | 27 September 2005, 00:17:09 UTC | git-clone: check out "master" by default. And with -n flag you can tell it not to. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2005, 01:04:17 UTC |
| 9e026d3 | Paul Mackerras | 27 September 2005, 00:29:41 UTC | Use "$@" rather than "${1+$@}" when invoking wish. | 27 September 2005, 00:29:41 UTC |
| 152da3d | Junio C Hamano | 25 September 2005, 23:28:51 UTC | Plug a small race in update-ref.c. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 September 2005, 02:25:09 UTC |
| a698753 | Paul Mackerras | 26 September 2005, 00:22:43 UTC | Change wish8.4 back to wish Checking in the change from wish to wish8.4 was a mistake; I had changed it for a test but forgot to change it back before checking in a patch. | 26 September 2005, 00:22:43 UTC |
| 66bf85a | Linus Torvalds | 25 September 2005, 18:43:05 UTC | [PATCH] Add "git-update-ref" to update the HEAD (or other) ref This is a careful version of the script stuff that currently just blindly writes HEAD with a new value. You can use git-update-ref HEAD <newhead> or git-update-ref HEAD <newhead> <oldhead> where the latter version verifies that the old value of HEAD matches oldhead. It basically allows a "ref" file to be a symbolic pointer to another ref file by starting with the four-byte header sequence of "ref:". More importantly, it allows the update of a ref file to follow these symbolic pointers, whether they are symlinks or these "regular file symbolic refs". NOTE! It follows _real_ symlinks only if they start with "refs/": otherwise it will just try to read them and update them as a regular file (ie it will allow the filesystem to follow them, but will overwrite such a symlink to somewhere else with a regular filename). In general, using git-update-ref HEAD "$head" should be a _lot_ safer than doing echo "$head" > "$GIT_DIR/HEAD" both from a symlink following standpoint _and_ an error checking standpoint. The "refs/" rule for symlinks means that symlinks that point to "outside" the tree are safe: they'll be followed for reading but not for writing (so we'll never write through a ref symlink to some other tree, if you have copied a whole archive by creating a symlink tree). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2005, 23:18:25 UTC |
| 8cc01e5 | Fredrik Kuivinen | 25 September 2005, 14:49:02 UTC | [PATCH] More descriptive messages for conflict cases in merges The merge strategies can give more descriptive error messages for conflict cases if they are given the actual branch names instead of the SHA1s. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2005, 23:08:54 UTC |
| 0bed189 | Fredrik Kuivinen | 25 September 2005, 14:48:24 UTC | [PATCH] recursive-merge: Don't print a stack trace when read-tree fails. If the working tree is dirty read-tree will fail, and we don't want an ugly stack trace in that case. Also make sure we don't print stack traces when we use 'die'. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2005, 23:08:53 UTC |
| 946f5f7 | Junio C Hamano | 21 September 2005, 07:20:06 UTC | Diff: --name-status output format. The new output format shows only the status letter and paths. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2005, 06:50:44 UTC |
| 8082d8d | Junio C Hamano | 21 September 2005, 07:18:27 UTC | Diff: -l<num> to limit rename/copy detection. When many paths are modified, rename detection takes a lot of time. The new option -l<num> can be used to disable rename detection when more than <num> paths are possibly created as renames. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2005, 06:50:44 UTC |
| 6b5ee13 | Junio C Hamano | 21 September 2005, 07:00:47 UTC | Diff clean-up. This is a long overdue clean-up to the code for parsing and passing diff options. It also tightens some constness issues. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2005, 06:50:43 UTC |
| dbc3743 | Junio C Hamano | 25 September 2005, 06:50:36 UTC | Merge branch 'fixes' | 25 September 2005, 06:50:36 UTC |
| a557976 | Junio C Hamano | 25 September 2005, 06:48:29 UTC | Clean generated files a bit more. Now we conditionally compile things in compat/, so we should remove object files there. Python execution can leave *.pyc and *.pyo, which need to be cleaned as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2005, 06:48:29 UTC |
| cf408cb | Junio C Hamano | 25 September 2005, 06:42:34 UTC | Stop installing the backward compatible symlinks. Also cmd-renames.sh can now be used to remove the backward compatible symlinks -- this is not used by default in any way. As discussed on the list with Pasky, git-ssh-push and git-ssh-pull will keep calling each other for a while longer. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2005, 06:42:34 UTC |
| fbaf834 | Junio C Hamano | 25 September 2005, 06:33:02 UTC | show-branch: fix commit naming breakage. It was ignoring the generation number of the commit when naming 2nd and later parents, showing "(linus^n)^2" for any <n> incorrectly as "linus^2". Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2005, 06:33:02 UTC |
| 7061f5c | Daniel Barkalow | 25 September 2005, 03:50:04 UTC | [PATCH] Finish documenting trivial merge rules Fix missing symbol explanations, a few incorrect cases, and add two-way merge rules. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2005, 05:05:55 UTC |
| c9fc748 | Junio C Hamano | 24 September 2005, 22:09:48 UTC | git-grep: fix 'git grep -e $pattern' handling People typically say 'grep -e $pattern' because $pattern has a leading dash which would be mistaken as a grep flag. Make sure we pass -e in front of $pattern when we invoke grep. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 22:09:48 UTC |
| c3bc895 | Junio C Hamano | 24 September 2005, 22:02:35 UTC | Remove use of 'xargs -0' from git-reset. Even without the trouble it causes to people without GNU xargs, it was not really necessary to print from Perl and then remove it outside. Just unlink it inside Perl. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 22:02:35 UTC |
| d66189e | Junio C Hamano | 24 September 2005, 21:58:57 UTC | Use 0.99.7.GIT as version between 0.99.7 and 0.99.8 Pasky taught me how he does his versioning for ELinks. This will sort after 0.99.7 and interim fixes 0.99.7a, and before 0.99.8. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 21:58:57 UTC |
| 229a7ed | Junio C Hamano | 23 September 2005, 17:41:40 UTC | Solaris: give a bit more built-in defaults. Taking the make command line Peter Eriksen uses, give defaults to SHELL_PATH, TAR, CURLDIR, NO_STRCASESTR, and INSTALL. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 18:26:22 UTC |
| 6d9bbc5 | Patrick Mauritz | 19 September 2005, 14:11:19 UTC | [PATCH] CURLDIR in Makefile Support systems that do not install curl headers and libraries in /usr/{include,lib}. Signed-off-by: Patrick Mauritz <oxygene@studentenbude.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 18:26:22 UTC |
| da38641 | Petr Baudis | 24 September 2005, 14:13:03 UTC | [PATCH] Rename daemon.c's lognotice() to loginfo() The syslog code logs with severity LOG_INFO in the loginfo() function, so make things less confusing. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 18:20:45 UTC |
| 9048fe1 | Petr Baudis | 24 September 2005, 14:13:01 UTC | [PATCH] git-daemon --syslog to log through syslog Well, this makes it even more clear that we need the packet reader and friends to use the daemon logging code. :/ Therefore, we at least indicate in the "Disconnect" log message if the child process exitted with an error code or not. Idea by Linus. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 18:20:45 UTC |
| b5cf3c8 | Petr Baudis | 24 September 2005, 14:12:58 UTC | [PATCH] Update git-daemon documentation wrt. the --verbose parameter Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 18:20:43 UTC |
| e558e33 | Junio C Hamano | 24 September 2005, 18:19:07 UTC | Really ignore generated distribution material. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 18:19:07 UTC |
| 1bedd4c | Junio C Hamano | 24 September 2005, 06:26:55 UTC | daemon.c: pid_t is not int. Reported by Morten Welinder <mwelinder@gmail.com>. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 06:26:55 UTC |
| 348c4c6 | Junio C Hamano | 24 September 2005, 01:46:34 UTC | Merge 'fixes' branch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 01:46:34 UTC |
| dc56bc0 | Junio C Hamano | 24 September 2005, 01:43:53 UTC | Further clarify licensing status of compat/subprocess.py. PSF license explicitly states the files in Python distribution is compatible with GPL, and upstream clarified the licensing terms by shortening its file header. This version is a verbatim copy from release24-maint branch form Python CVS. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 01:43:53 UTC |
| e433b07 | H. Peter Anvin | 23 September 2005, 23:30:50 UTC | [PATCH] rsh.c unterminated string The change I made to rsh.c would leave the string unterminated under certain conditions, which unfortunately always applied! This patch fixes this. For some reason this never bit on i386 or ppc, but bit me on x86-64. Fix situation where the buffer was not properly null-terminated. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2005, 01:07:42 UTC |
| 628cd54 | Sergey Vlasov | 23 September 2005, 12:28:38 UTC | [PATCH] git-local-fetch: Avoid confusing error messages on packed repositories If the source repository was packed, and git-local-fetch needed to fetch a pack file, it spewed a misleading error message about not being able to find the unpacked object. Fixed by adding the warn_if_not_exists argument to copy_file(), which controls printing of error messages in case the source file does not exist. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 21:30:46 UTC |
| e2b77f0 | Sergey Vlasov | 23 September 2005, 12:28:33 UTC | [PATCH] Fix "git-local-fetch -s" with packed source repository "git-local-fetch -s" did not work with a packed repository, because symlink() happily created a link to a non-existing object file, therefore fetch_file() always returned success, and fetch_pack() was not called. Fixed by calling stat() before symlink() to ensure the file really exists. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 21:30:45 UTC |
| 1a95181 | Sergey Vlasov | 23 September 2005, 12:28:28 UTC | [PATCH] git-local-fetch: Avoid calling close(-1) After open() failure, copy_file() called close(ifd) with ifd == -1 (harmless, but causes Valgrind noise). The same thing was possible for the destination file descriptor. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 21:30:45 UTC |
| 8be707d | Sergey Vlasov | 23 September 2005, 12:28:23 UTC | [PATCH] git-local-fetch: Fix error checking and leak in setup_indices() setup_indices() did not check the return value of opendir(), and did not have a corresponding closedir() call. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 21:30:45 UTC |
| d35bbe0 | Sergey Vlasov | 23 September 2005, 12:28:18 UTC | [PATCH] fetch.c: Plug memory leak in process_tree() When freeing a tree entry, must free its name too. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 21:30:45 UTC |
| a95cb6f | Sergey Vlasov | 23 September 2005, 12:28:13 UTC | [PATCH] fetch.c: Do not build object ref lists The fetch code does not need object ref lists; by disabling them we can save some time and memory. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 21:30:42 UTC |
| ff8489c | Robert Watson | 23 September 2005, 10:06:04 UTC | [PATCH] document command to show diff of a commit Document the best way to show the change introduced by a commit, based on the suggestion by Linus on the list. Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 21:28:40 UTC |
| e20b134 | Junio C Hamano | 23 September 2005, 21:02:57 UTC | Ignore a bit more generated files. Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 21:02:57 UTC |
| 7fe2fc7 | Junio C Hamano | 23 September 2005, 07:53:43 UTC | Merge branch 'fixes' | 23 September 2005, 07:53:43 UTC |
| 9f92f15 | Junio C Hamano | 23 September 2005, 07:53:02 UTC | Make 'git diff --cached' synonymous to 'git diff --cached HEAD'. When making changes to different files (i.e. dirty working tree) and committing logically separate changes in groups, often it is necessary to run 'git diff --cached HEAD' to make sure that the changes being committed makes sense. Saying 'git diff --cached' by mistake gives rather uninformative error message from git-diff-files complaining it does not understand --cached flag. Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 07:53:02 UTC |
| 2c08b36 | Sergey Vlasov | 21 September 2005, 16:34:29 UTC | [PATCH] fetch.c: Remove call to parse_object() from process() The call to parse_object() in process() is not actually needed - if the object type is unknown, parse_object() will be called by loop(); if the type is known, the object will be parsed by the appropriate process_*() function. After this change blobs which exist locally are no longer parsed, which gives about 2x CPU usage improvement; the downside is that there will be no warnings for existing corrupted blobs, but detecting such corruption is the job of git-fsck-objects, not the fetch programs. Newly fetched objects are still checked for corruption in http-fetch.c and ssh-fetch.c (local-fetch.c does not seem to do it, but the removed parse_object() call would not be reached for new objects anyway). Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 04:52:12 UTC |
| 24451c3 | Sergey Vlasov | 21 September 2005, 16:34:24 UTC | [PATCH] fetch.c: Clean up object flag definitions Remove holes left after deleting flags, and use shifts to emphasize that flags are single bits. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 04:52:11 UTC |
| 2449696 | Sergey Vlasov | 21 September 2005, 16:34:19 UTC | [PATCH] fetch.c: Remove redundant test of TO_SCAN in process() If the SEEN flag was not set, the TO_SCAN flag cannot be set, therefore testing it is pointless. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 04:52:11 UTC |
| 7b64d06 | Sergey Vlasov | 21 September 2005, 16:34:14 UTC | [PATCH] fetch.c: Remove some duplicated code in process() It does not matter if we call prefetch() or set the TO_SCAN flag before or after adding the object to process_queue. However, doing it before object_list_insert() allows us to kill 3 lines of duplicated code. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2005, 04:52:11 UTC |
