summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Documentation: git-add -- do not say "cache", add examples.Junio C Hamano2005-11-041-4/+39
| | | | | | | Its use of git-ls-files --others is very nice, but sometimes gives surprising results, so we'd better talk about it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-tag: Do not assume the working tree root is writable.Junio C Hamano2005-11-031-11/+13
| | | | | | | | | | | This is a long overdue companion commit that fixed git-commit (Santi's f8e2c54c9a17af3319e96db1d9e97ace36ae6831). Having the temporary files in the working tree root when making tags is not as bad because it does not involve 'git status' as the git-commit case, but this makes things more consistent. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove the temp file if it is empty after the request has failedNick Hengeveld2005-11-031-0/+5
| | | | | | | | | | | | | After using cg-update to pull, empty files named *.temp are left in the various subdirectories of .git/objects/. These are created by git-http-fetch to hold data as it's being fetched from the remote repository. They are left behind after a transfer error so that the next time git-http-fetch runs it can pick up where it left off. If they're empty though, it would make more sense to delete them rather than leaving them behind for the next attempt. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Illustration: "Commit DAG Revision Naming"Junio C Hamano2005-11-031-0/+26
| | | | | | Jon Loeliger's ASCII art in the git-rev-parse(1) manual. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Illustration: "Git Diff Types"Junio C Hamano2005-11-031-0/+35
| | | | | | Jon Loeliger's ASCII art in the Tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Illustration: "Fundamental Git Index Operations"Junio C Hamano2005-11-031-0/+40
| | | | | | Jon Loeliger's ASCII art in the Discussion section. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-merge-ours: make sure our index matches HEADJunio C Hamano2005-11-031-0/+7
| | | | | | | | | | git-merge expects this check to be done appropriately by the merge strategy backends. In the case of merge-ours strategy, the resulting tree comes what we have in the index file, so it must match the current HEAD; otherwise it would not be "ours" merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add 'ours' merge strategy.Junio C Hamano2005-11-034-2/+10
| | | | | | | | | | | | | This adds the coolest merge strategy ever, "ours". It can take arbitrary number of foreign heads and merge them into the current branch, with the resulting tree always taken from our branch head, hence its name. What this means is that you can declare that the current branch supersedes the development histories of other branches using this merge strategy. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add --no-commit to git-merge/git-pull.Junio C Hamano2005-11-032-12/+22
| | | | | | | | | With --no-commit flag, git-pull will perform the merge but pretends as if the merge needed a hand resolve even if automerge cleanly resolves, to give the user a chance to add further changes and edit the commit message. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document --since and --until options to rev-parse.Junio C Hamano2005-11-021-0/+8
| | | | | | | The usability magic were hidden in the source code without being documented, and even the maintainer did not know about them ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Be careful when dereferencing tags.Junio C Hamano2005-11-029-14/+21
| | | | | | | | | | One caller of deref_tag() was not careful enough to make sure what deref_tag() returned was not NULL (i.e. we found a tag object that points at an object we do not have). Fix it, and warn about refs that point at such an incomplete tag where needed. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Clean up the SunOS Makefile rulePeter Eriksen2005-11-021-1/+1
| | | | | | | | Don't set a non-standard CURLDIR as default, and fix an error in Solaris 10 by setting NEEDS_LIBICONV. Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Ignore '\r' at the end of line in $GIT_DIR/configJunio C Hamano2005-11-021-0/+8
| | | | | | | | Unfortunate people may have to use $GIT_DIR/config edited on DOSsy machine on UNIXy machine. Ignore '\r' immediately followed by '\n'. Signed-off-by: Junio C Hamano <junkio@cox.net>
* remove CR/LF from .gitignoreAlex Riesen2005-11-022-1/+13
| | | | | | | | | | | For everyone cursed by dos/windows line endings (aka CRLF): The code reading the .gitignore files (excludes and excludes per directory) leaves \r in the patterns, which causes fnmatch to fail for no obvious reason. Just remove a "\r" preceding a "\n" unconditionally. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Do not fail on hierarchical branch names.Junio C Hamano2005-11-022-1/+5
| | | | | | | | | | | | "git-checkout -b frotz/nitfol master" failed to create $GIT_DIR/refs/heads/frotz/nitfol but went ahead and updated $GIT_DIR/HEAD to point at it, resulting in a corrupt repository. Exit when we cannot create the new branch with an error status. While we are at it, there is no reason to forbid subdirectories in refs/heads, so make sure we handle that correctly. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make test-date buildable again.Junio C Hamano2005-11-021-2/+2
| | | | | | | Now we define and use our own ctype-replacement, we need to link with it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-clone: do not forget to create origin branch.Junio C Hamano2005-11-011-4/+11
| | | | | | | | | | The newly cloned repository by default had .git/remotes/origin set up to track the remote master to origin, but forgot to create the origin branch ourselves. Also it hardcoded the assumption that the remote HEAD points at "master", which may not always be true. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Do not put automatic merge message after signed-off-by line.Junio C Hamano2005-11-011-3/+3
| | | | | | | | 'git-commit -s' after a failed automerge inserted the automerge message in a wrong place. The signed-off-by line should come last. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add -P to the documentation head.Junio C Hamano2005-11-011-1/+1
| | | | | | | This is a companion patch for 211dcac6430cdf77fcf2a968ffaf9313b5c059b0 commit, to add the newly introduced -P option to the list of options. Signed-off-by: Junio C Hamano <junkio@cox.net>
* cvsimport: cvsps should be quiet tooMartin Langhoff2005-11-011-0/+1
| | | | | | | Tell cvsps to be quiet, unless we've been told to be verbose. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cvsimport: introduce -P <cvsps-output-file> optionMartin Langhoff2005-11-012-4/+12
| | | | | | | | | -P:: <cvsps-output-file> Instead of calling cvsps, read the provided cvsps output file. Useful for debugging or when cvsps is being handled outside cvsimport. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cvsimport: catch error condition where cvs host disappearsMartin Langhoff2005-11-011-0/+4
| | | | | | | | | Add error handling for cases where the cvs server goes away unexpectedly. While I don't know why the cvs server is so erratic, we should definitely exit here before committing bogus files. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Do not install backward compatibility links anymore.Junio C Hamano2005-11-012-5/+12
| | | | | | | | | | | This is a companion patch to 4f9dcf7e5cf6c82455925102d315daf3b833e6d6 which stops mentioning the old command names. As promised, we do not install symlinks to let people use backward compatibility names anymore. cmd-rename.sh script is still shipped to help people who installed previous git by hand to clean up the leftover symlinks. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Strip any trailing slash on destination argumentJosef Weidendorfer2005-11-011-0/+2
| | | | | | | | | | | | Needed because generating a target paths will add another slash. This fixes e.g. "git-mv file dir/", which removed "file" from version control by renaming it to "dir//file", as git-update-index does not accept such paths. Thanks goes to Ben Lau for noting this bug. Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-am.txt is no stub anymorePetr Baudis2005-11-011-2/+0
| | | | | | | | | That notice was added by me for the emergency documentation, but Junio already expanded it to a full-fledged manual page. This patch removes the notice. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation for git-fmt-merge-msgPetr Baudis2005-11-012-0/+49
| | | | | | | | | | Simple description. It appears to be mostly internal command, but hey, it is (it seems) the only undocumented one, so let's fix it up... Also add a note about it to git-merge documentation. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove git-findtags.perlPetr Baudis2005-11-012-95/+1
| | | | | | | | This script was superseded by git-name-rev, which is more versatile, actually documented, faster, and everything else... Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove 'Previously this command was known as ...' messages.Jon Loeliger2005-11-011-44/+0
| | | | | | | | | | For a 1.0 release, there is no need to maintain the historical "Previously this command was known as..." information on the doc splash page. It is noise; command names should stand on their own now. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix constness of input in mozilla-sha1/sha1.c::SHA1_Update().Junio C Hamano2005-11-012-3/+3
| | | | | | | Among the three of our own implementations, only this one lacked "const" from the second argument. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the use of "current directory" as pull source.Junio C Hamano2005-11-012-1/+6
| | | | | | | | The repository to pull from can be a local repository, and as a special case the current directory can be specified to perform merges across local branches. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add examples for git-log documentation and others.Linus Torvalds2005-10-303-0/+45
| | | | | | | | | | | | | | | | | | | I don't think people really follow the links or think very abstractly at all in the first place. So I was thinking more of some explicit examples. I actually think every command should have an example in the man-page, and hey, here's a patch to start things off. Of course, I'm not exactly "Mr Documentation", and I don't know that this is the prettiest way to do this, but I checked that the resulting html and man-page seems at least reasonable. And hey, if the examples look like each other, that's just because I'm also not "Mr Imagination". Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Work around an RPM build problem.Junio C Hamano2005-10-301-1/+1
| | | | | | | | | | | | The require statement at the top of git-svnimport seems to confuse rpmbuild dependency generation. It uses the newer notation "v5.8.0", and rpm ends up requiring "perl(v5.8.0)", while we would want it to say something like "perl >= 0:5.008". Ryan suggests old-style "require 5.008" might fix this problem, so here it is. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix rev-list documentation again (--sparse and pathspec)Junio C Hamano2005-10-301-4/+5
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git-pack-objects documentation.Junio C Hamano2005-10-301-1/+6
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git-rev-list options list in rev-parse.Junio C Hamano2005-10-301-0/+2
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update usage string and documentation for git-rev-list.Junio C Hamano2005-10-302-17/+70
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add to usage and docs for git-add.shChris Shoemaker2005-10-302-1/+15
| | | | | Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add to documentation of git-update-index arguments and usage.Chris Shoemaker2005-10-302-8/+25
| | | | | | | Removed unknown [--version] option. Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add usage statement to git-checkout.shChris Shoemaker2005-10-301-0/+7
| | | | | Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 0.99.9 master branch.Junio C Hamano2005-10-301-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 0.99.9v0.99.9Junio C Hamano2005-10-292-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done in 0.99.9 ============== Ports ~~~~~ * Cygwin port [HPA]. * OpenBSD build [Merlyn and others]. Fixes ~~~~~ * clone request over git native protocol from a repository with too many refs did not work; this has been fixed. * git-daemon got safer for kernel.org use [HPA]. * Extended SHA1 parser was not enforcing uniqueness for abbreviated SHA1; this has been fixed. * http transport does not barf on funny characters in URL. * The ref naming restrictions have been formalized and the coreish refuses to create funny refs; we still need to audit importers. See git-check-ref-format(1). New Features and Commands ~~~~~~~~~~~~~~~~~~~~~~~~~ * .git/config file as a per-repository configuration mechanism, and some commands understand it [Linus]. See git(7). * The core.filemode configuration item can be used to make us a bit more FAT friendly. See git(7). * The extended SHA1 notation acquired Peel-the-onion operator ^{type} and ^{}. See git-rev-parse(1). * SVN importer [Matthias]. See git-svnimport(1). * .git/objects/[0-9a-f]{2} directories are created on demand, and removed when becomes empty after prune-packed [Linus]. * Filenames output from various commands without -z option are quoted when they embed funny characters (TAB and LF) using C-style quoting within double-quotes, to match the proposed GNU diff/patch notation [me, but many people contributed in the discussion]. * git-mv is expected to be a better replacement for git-rename. While the latter has two parameter restriction, it acts more like the regular 'mv' that can move multiple things to one destinatino directory [Josef Weidendorfer]. * git-checkout can take filenames to revert the changes to them. See git-checkout(1) * The new program git-am is a replacement for git-applymbox that has saner command line options and a bit easier to use when a patch does not apply cleanly. * git-ls-remote can show unwrapped onions using ^{} notation, to help Cogito to track tags. * git-merge-recursive backend can merge unrelated projects. * git-clone over native transport leaves the result packed. * git-http-fetch issues multiple requests in parallel when underlying cURL library supports it [Nick and Daniel]. * git-fetch-pack and git-upload-pack try harder to figure out better common commits [Johannes]. * git-read-tree -u removes a directory when it makes it empty. * git-diff-* records abbreviated SHA1 names of original and resulting blob; this sometimes helps to apply otherwise an unapplicable patch by falling back to 3-way merge. * git-format-patch now takes series of from..to rev ranges and with '-m --stdout', writes them out to the standard output. This can be piped to 'git-am' to implement cheaper cherry-picking. * git-tag takes '-u' to specify the tag signer identity [Linus]. * git-rev-list can take optional pathspecs to skip commits that do not touch them (--dense) [Linus]. * Comes with new and improved gitk [Paulus and Linus]. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation updates.Junio C Hamano2005-10-293-7/+59
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Do not mmap-copy the whole thing; just use copy_fd()Junio C Hamano2005-10-291-18/+10
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Teach local-fetch about lazy object directories.Junio C Hamano2005-10-291-2/+3
| | | | | | | | | The latest init-db does not create .git/objects/??/ directories anymore and expects the users of the repository to create them as they are needed. local-fetch was not taught about it, which broke local cloning with Cogito. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix recent documentation format breakage.Junio C Hamano2005-10-291-6/+6
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* make t5501 less annoyingJohannes Schindelin2005-10-281-2/+2
| | | | | | | | | On Linux, "mktemp tmp-XXXX" will not work. Also, redirect stderr on which, so it does not complain too loudly. After all, this test should only be executed when old binaries are available. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* fix multi_ack.Johannes Schindelin2005-10-282-5/+10
| | | | | Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-fetch-pack: Support multi_ack extensionJohannes Schindelin2005-10-282-17/+46
| | | | | | | The client side support for multi_ack. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-upload-pack: Support the multi_ack protocolJohannes Schindelin2005-10-281-23/+24
| | | | | | | | | | | | | | | | | | | | | | This implements three things (trying very hard to be backwards compatible): It sends the "multi_ack" capability via the mechanism proposed by Sergey Vlasov. When the client sends "multi_ack" with at least one "want", multi_ack is enabled. When multi_ack is enabled, "continue" is appended to each "ACK" until either the server can not store more refs, or "done" is received. In contrast to the original protocol, as long as "continue" is sent, flushes are answered by a "NAK" (not just until an "ACK" was sent), and if "continue" was sent at least once, the last message is an "ACK" without "continue". Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Support receiving server capabilitiesJohannes Schindelin2005-10-282-1/+16
| | | | | | | | | | | | | | | | | | This patch implements the client side of backward compatible upload-pack protocol extension, <20051027141619.0e8029f2.vsu@altlinux.ru> by Sergey. The updated server can append "server_capabilities" which is supposed to be a string containing space separated features of the server, after one of elements in the initial list of SHA1-refname line, hidden with an embedded NUL. After get_remote_heads(), check if the server supports the feature like if (server_supports("multi_ack")) do_something(); Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status