AgeCommit message (Collapse)Author
2005-11-03Add --no-commit to git-merge/git-pull.Junio C Hamano
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 <>
2005-11-03Document --since and --until options to rev-parse.Junio C Hamano
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 <>
2005-11-03Be careful when dereferencing tags.Junio C Hamano
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 <>
2005-11-03[PATCH] Clean up the SunOS Makefile rulePeter Eriksen
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 <> Signed-off-by: Junio C Hamano <>
2005-11-03Ignore '\r' at the end of line in $GIT_DIR/configJunio C Hamano
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 <>
2005-11-03remove CR/LF from .gitignoreAlex Riesen
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 <>
2005-11-03Do not fail on hierarchical branch names.Junio C Hamano
"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 <>
2005-11-03Make test-date buildable again.Junio C Hamano
Now we define and use our own ctype-replacement, we need to link with it. Signed-off-by: Junio C Hamano <>
2005-11-02git-clone: do not forget to create origin branch.Junio C Hamano
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 <>
2005-11-02Do not put automatic merge message after signed-off-by line.Junio C Hamano
'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 <>
2005-11-02Add -P to the documentation head.Junio C Hamano
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 <>
2005-11-02cvsimport: cvsps should be quiet tooMartin Langhoff
Tell cvsps to be quiet, unless we've been told to be verbose. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2005-11-02cvsimport: introduce -P <cvsps-output-file> optionMartin Langhoff
-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 <> Signed-off-by: Junio C Hamano <>
2005-11-02cvsimport: catch error condition where cvs host disappearsMartin Langhoff
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 <> Signed-off-by: Junio C Hamano <>
2005-11-02Do not install backward compatibility links anymore.Junio C Hamano
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. 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 <>
2005-11-01Strip any trailing slash on destination argumentJosef Weidendorfer
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 <> Signed-off-by: Junio C Hamano <>
2005-11-01git-am.txt is no stub anymorePetr Baudis
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 <> Signed-off-by: Junio C Hamano <>
2005-11-01Documentation for git-fmt-merge-msgPetr Baudis
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 <> Signed-off-by: Junio C Hamano <>
2005-11-01Remove git-findtags.perlPetr Baudis
This script was superseded by git-name-rev, which is more versatile, actually documented, faster, and everything else... Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2005-11-01Remove 'Previously this command was known as ...' messages.Jon Loeliger
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 <> Signed-off-by: Junio C Hamano <>
2005-11-01Fix constness of input in mozilla-sha1/sha1.c::SHA1_Update().Junio C Hamano
Among the three of our own implementations, only this one lacked "const" from the second argument. Signed-off-by: Junio C Hamano <>
2005-11-01Document the use of "current directory" as pull source.Junio C Hamano
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 <>
2005-10-31Add examples for git-log documentation and others.Linus Torvalds
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 <> Signed-off-by: Junio C Hamano <>
2005-10-31Work around an RPM build problem.Junio C Hamano
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 <>
2005-10-31Fix rev-list documentation again (--sparse and pathspec)Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-10-31Update git-pack-objects documentation.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-10-31Update git-rev-list options list in rev-parse.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-10-31Update usage string and documentation for git-rev-list.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-10-31Add to usage and docs for git-add.shChris Shoemaker
Signed-off-by: Chris Shoemaker <> Signed-off-by: Junio C Hamano <>
2005-10-31Add to documentation of git-update-index arguments and usage.Chris Shoemaker
Removed unknown [--version] option. Signed-off-by: Chris Shoemaker <> Signed-off-by: Junio C Hamano <>
2005-10-31Add usage statement to git-checkout.shChris Shoemaker
Signed-off-by: Chris Shoemaker <> Signed-off-by: Junio C Hamano <>
2005-10-31GIT 0.99.9 master branch.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-10-29GIT 0.99.9v0.99.9Junio C Hamano
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 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 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 <>
2005-10-29Documentation updates.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-10-29Do not mmap-copy the whole thing; just use copy_fd()Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-10-29Teach local-fetch about lazy object directories.Junio C Hamano
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 <>
2005-10-29Fix recent documentation format breakage.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-10-29make t5501 less annoyingJohannes Schindelin
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 <> Signed-off-by: Junio C Hamano <>
2005-10-29fix multi_ack.Johannes Schindelin
Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-10-29git-fetch-pack: Support multi_ack extensionJohannes Schindelin
The client side support for multi_ack. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-10-29git-upload-pack: Support the multi_ack protocolJohannes Schindelin
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 <> Signed-off-by: Junio C Hamano <>
2005-10-29Support receiving server capabilitiesJohannes Schindelin
This patch implements the client side of backward compatible upload-pack protocol extension, <> 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 <> Signed-off-by: Junio C Hamano <>
2005-10-29git-upload-pack: More efficient usage of the has_sha1 arrayJohannes Schindelin
This patch is based on Junio's proposal. It marks parents of common revs so that they do not clutter up the has_sha1 array. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-10-29Implement an interoperability test for fetch-pack/upload-packJohannes Schindelin
The next patches will extend the pack protocol. This test assures that this extension is compatible to earlier versions of git-fetch-pack/git-upload-pack. All you need to do to take advantage of this test, is to install older known-to-be-working binaries in the path as "old-git-fetch-pack" and "old-git-upload-pack". Note that the warning when testing with old-git-fetch-pack is to be expected (it just says that the old version was not taking advantage of all the information which the server sent). Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-10-29Implement a test for git-fetch-pack/git-upload-packJohannes Schindelin
This test provides a minimal example of what went wrong with the old git-fetch-pack (and now works beautifully). Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-10-29Make maximal use of the remote refsJohannes Schindelin
When git-fetch-pack gets the remote refs, it does not need to filter them right away, but it can see which refs are common (taking advantage of the patch which makes git-fetch-pack not use git-rev-list). This means that we ask get_remote_heads() to return all remote refs, including the funny refs, and filtering them with a separate function later. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-10-29Subject: [PATCH] git-fetch-pack: Do not use git-rev-listJohannes Schindelin
The code used to call git-rev-list to enumerate the local revisions. A disadvantage of that method was that git-rev-list, lacking a control apart from the command line, would happily enumerate ancestors of acknowledged common commits, which was just taking unnecessary bandwidth. Therefore, do not use git-rev-list on the fetching side, but rather construct the list on the go. Send the revisions starting from the local heads, ignoring the revisions known to be common. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-10-29git-apply --numstatJunio C Hamano
The new option, --numstat, shows number of inserted and deleted lines for each path. It is similar to --stat output but is meant to be more machine friendly by giving number of added and deleted lines and unabbreviated paths. Signed-off-by: Junio C Hamano <>
2005-10-29Add usage help to
Also clarify failure to push to read-only remote. Especially, state why rsync:// is not used for pushing. [jc: ideally rsync should not be used for anything] Signed-off-by: Chris Shoemaker <c.shoemaker at> Signed-off-by: Junio C Hamano <>
2005-10-29Add usage help for
Signed-off-by: Chris Shoemaker <c.shoemaker at> Signed-off-by: Junio C Hamano <>