summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] Enable and fix support for base less merges.Fredrik Kuivinen2005-10-033-3/+9
| | | | | | | | | | | | | | | | | | | | Let the merge strategies handle the base less case if they are able to do it. It also fixes git-resolve.sh to die if no common ancestors exists, instead of doing the wrong thing. Furthermore, it contains a small independent fix for git-merge.sh and a fix for a base less code path in gitMergeCommon.py. With this it's possible to use git merge -s recursive 'merge message' A B to do a base less merge of A and B. [jc: Thanks Fredrik for fixing the brown-paper-bag in git-merge. I fixed a small typo in git-merge-resolve fix; 'test' equality check is spelled with single equal sign -- C-style double equal sign is bashism.] Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make sure get_sha1 does not accept ambiguous sha1 prefix.Junio C Hamano2005-10-021-21/+68
| | | | | | | | The original code did not even check alternates, and was confused if an unpacked object was uniquely found when there was another object that shares the same prefix in the pack. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix minor DOS in rev-list.Junio C Hamano2005-10-021-1/+11
| | | | | | | A carefully crafted pathname can be used to disrupt downstream git-pack-objects that uses 'git-rev-list --objects' output. Prevent this. Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 0.99.8v0.99.8Junio C Hamano2005-10-022-1/+7
| | | | | | | | 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>
* [PATCH] Update git-clone documentationEric W. Biederman2005-10-021-1/+14
| | | | | | | | | 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>
* Handle really trivial case inside git-merge.Junio C Hamano2005-10-021-1/+21
| | | | | | | | | | | | | 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>
* read-tree: --trivialLinus Torvalds2005-10-021-0/+12
| | | | | | | | 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>
* [PATCH] Teach git-ls-files about '--' to denote end of options.Fredrik Kuivinen2005-10-023-2/+82
| | | | | | | 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>
* [PATCH] Teach the recursive merge strategy about renames.Fredrik Kuivinen2005-10-021-185/+601
| | | | | | | | | 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>
* read-tree: remove --head option.Junio C Hamano2005-10-021-8/+2
| | | | | | | 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>
* Customize git command for installations that lack certain commands.Junio C Hamano2005-10-022-12/+50
| | | | | | | | | 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>
* [PATCH] git on OpenBSDHan Boetes2005-10-021-0/+4
| | | | | | iconv is installed in /usr/local. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Re-instate index file write optimizationLinus Torvalds2005-10-011-3/+5
| | | | | | | | | | | | 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>
* [PATCH] Better error reporting for "git status"Linus Torvalds2005-10-014-12/+24
| | | | | | | | | | | | | | | | | | | | 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>
* More portability.Junio C Hamano2005-10-014-22/+34
| | | | | | | | | | | - 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>
* Add git-symbolic-refJunio C Hamano2005-10-0116-57/+176
| | | | | | | | | | | | | 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>
* Use resolve_ref() to implement read_ref().Junio C Hamano2005-10-013-88/+64
| | | | | | | 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>
* [PATCH] Allow reading "symbolic refs" that point to other refsLinus Torvalds2005-10-013-49/+42
| | | | | | | | | | | | | | | | 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>
* Teach update-ref about a symbolic ref stored in a textfile.Junio C Hamano2005-10-011-1/+14
| | | | | | | | | | | | | | | | | 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>
* [PATCH] git fetch --tagsLinus Torvalds2005-10-011-1/+24
| | | | | | | | | | | | | | | | 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>
* [PATCH] HTTP partial transfer support fix.Nick Hengeveld2005-10-011-1/+0
| | | | | | | | 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>
* Update partial HTTP transfers.Junio C Hamano2005-10-011-4/+11
| | | | | | | | | | | | | | | | | | 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>
* [PATCH] HTTP partial transfer support for object, pack, and index transfersNick Hengeveld2005-10-011-23/+161
| | | | | | | | | | 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>
* Pass CVSps generated A U Thor <author@domain.xz> intact.Junio C Hamano2005-10-011-7/+11
| | | | | | | | | | 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>
* [PATCH] archimport: Actually cope with merges from "remote" repositories. ↵Martin Langhoff2005-10-011-1/+7
| | | | | | | | | | | | 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>
* Honor extractor's umask in git-tar-tree.Junio C Hamano2005-10-011-0/+2
| | | | | | | | | 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>
* Honor user's umask.Junio C Hamano2005-10-012-2/+2
| | | | | | | | | 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>
* [PATCH] Flag empty patches as errorsLinus Torvalds2005-09-301-0/+13
| | | | | | | | | | | | | | | | | | | | | | | 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>
* Consolidate null_sha1[].Junio C Hamano2005-09-304-3/+4
| | | | Signed-off-by: Junio C Hamano <junio@twinsun.com>
* Still installing the old command names.Junio C Hamano2005-09-302-11/+6
| | | | | | | | | | | | | 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>
* Tell which packfile is corrupt when we die.Junio C Hamano2005-09-301-3/+5
| | | | | | | 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>
* [PATCH] Make logerror() and loginfo() staticPavel Roskin2005-09-291-2/+2
| | | | | | | | | | | 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>
* [PATCH] Old curl does not know about CURLOPT_SSLKEYJohannes Schindelin2005-09-291-0/+2
| | | | | | | ... 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>
* Use git-merge in git-pull (second try).Junio C Hamano2005-09-291-4/+44
| | | | | | | | | | | | | | 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>
* Use git-update-ref in scripts.Junio C Hamano2005-09-289-32/+39
| | | | | | | | | 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>
* [PATCH] Make some needlessly global stuff staticPeter Hagervall2005-09-283-5/+5
| | | | | | | Insert 'static' where appropriate. Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Support for more CURL SSL settings via environment variablesNick Hengeveld2005-09-281-0/+19
| | | | | | | | | 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>
* [PATCH] Add new programs to .gitignore.Tom Prince2005-09-281-0/+2
| | | | | Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fastpath the normal case by not checking that index matches HEAD.Junio C Hamano2005-09-281-7/+4
| | | | | | | 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>
* Fix default pull not to do an unintended Octopus.Junio C Hamano2005-09-284-8/+43
| | | | | | | | | | | | 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>
* Update the case table in t/t1000.Junio C Hamano2005-09-281-31/+12
| | | | | | | | 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>
* Merge master.kernel.org:/home/hpa/git/daemonJunio C Hamano2005-09-272-6/+74
|\
| * COPTS -> CFLAGSH. Peter Anvin2005-09-271-1/+2
| |
| * Parallelize the buildH. Peter Anvin2005-09-271-2/+5
| |
| * Merge with git+ssh://master.kernel.org/pub/scm/git/git.gitH. Peter Anvin2005-09-278-39/+89
| |\
| * | Restore chdir(".git")H. Peter Anvin2005-09-271-0/+2
| | |
| * | Support a modicum of path validation, and allow an export all trees option.H. Peter Anvin2005-09-261-5/+67
| | |
* | | git-commit: use update-index --stdin, instead of xargs.Junio C Hamano2005-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | 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>
* | | update-index: document --stdin and -zJunio C Hamano2005-09-271-1/+10
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | update-index: --stdin and -zJunio C Hamano2005-09-271-13/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
View Lorry Controller Status