Permalink
Commits on Nov 2, 2005
  1. GIT 0.99.9b

    This contains the changes made on the master branch since 0.99.9a.
    
    The workaround for building RPMs has not changed since 0.99.9a,
    mainly because I haven't heard back if it was good enough for
    kernel.org consumption, or otherwise what changes are needed.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
  2. Add -P to the documentation head.

    This is a companion patch for 211dcac
    commit, to add the newly introduced -P option to the list of options.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
  3. cvsimport: cvsps should be quiet too

    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>
    Martin Langhoff committed with Junio C Hamano Nov 2, 2005
  4. cvsimport: introduce -P <cvsps-output-file> option

    -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>
    Martin Langhoff committed with Junio C Hamano Nov 2, 2005
  5. cvsimport: catch error condition where cvs host disappears

    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>
    Martin Langhoff committed with Junio C Hamano Nov 2, 2005
  6. Do not install backward compatibility links anymore.

    This is a companion patch to 4f9dcf7
    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>
    Junio C Hamano committed Nov 2, 2005
Commits on Nov 1, 2005
  1. @weidendo

    Strip any trailing slash on destination argument

    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>
    weidendo committed with Junio C Hamano Nov 1, 2005
  2. git-am.txt is no stub anymore

    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>
    Petr Baudis committed with Junio C Hamano Nov 1, 2005
  3. Documentation for git-fmt-merge-msg

    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>
    Petr Baudis committed with Junio C Hamano Nov 1, 2005
  4. Remove git-findtags.perl

    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>
    Petr Baudis committed with Junio C Hamano Nov 1, 2005
  5. Remove 'Previously this command was known as ...' messages.

    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>
    Jon Loeliger committed with Junio C Hamano Nov 1, 2005
  6. Fix constness of input in mozilla-sha1/sha1.c::SHA1_Update().

    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>
    Junio C Hamano committed Nov 1, 2005
  7. Document the use of "current directory" as pull source.

    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>
    Junio C Hamano committed Nov 1, 2005
  8. Merge branch 'fixes'

    Junio C Hamano committed Nov 1, 2005
Commits on Oct 31, 2005
  1. Add examples for git-log documentation and others.

    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>
    Linus Torvalds committed with Junio C Hamano Oct 31, 2005
  2. GIT 0.99.9a

    ... to contain the RPM workaround.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 31, 2005
  3. Work around an RPM build problem.

    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>
    Junio C Hamano committed Oct 30, 2005
  4. Fix rev-list documentation again (--sparse and pathspec)

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 30, 2005
  5. Update git-pack-objects documentation.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 30, 2005
  6. Update git-rev-list options list in rev-parse.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 30, 2005
  7. Update usage string and documentation for git-rev-list.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 30, 2005
  8. @spot

    Add to usage and docs for git-add.sh

    Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spot committed with Junio C Hamano Oct 29, 2005
  9. @spot

    Add to documentation of git-update-index arguments and usage.

    Removed unknown [--version] option.
    
    Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spot committed with Junio C Hamano Oct 29, 2005
  10. @spot

    Add usage statement to git-checkout.sh

    Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    spot committed with Junio C Hamano Oct 29, 2005
  11. GIT 0.99.9 master branch.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 31, 2005
Commits on Oct 29, 2005
  1. GIT 0.99.9

    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>
    Junio C Hamano committed Oct 29, 2005
  2. Documentation updates.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 29, 2005
  3. Do not mmap-copy the whole thing; just use copy_fd()

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 29, 2005
  4. Teach local-fetch about lazy object directories.

    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>
    Junio C Hamano committed Oct 29, 2005
  5. Fix recent documentation format breakage.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 29, 2005
  6. @dscho

    make t5501 less annoying

    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>
    dscho committed with Junio C Hamano Oct 28, 2005
  7. @dscho

    fix multi_ack.

    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Oct 28, 2005
  8. @dscho

    git-fetch-pack: Support multi_ack extension

    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>
    dscho committed with Junio C Hamano Oct 28, 2005
  9. @dscho

    git-upload-pack: Support the multi_ack protocol

    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>
    dscho committed with Junio C Hamano Oct 28, 2005
  10. @dscho

    Support receiving server capabilities

    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>
    dscho committed with Junio C Hamano Oct 28, 2005