Permalink
Commits on Oct 20, 2006
  1. Fix typo in show-index.c

    hjemli committed with Junio C Hamano Oct 20, 2006
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. pager: default to LESS=FRS

    Junio C Hamano committed Oct 20, 2006
    Recent change to paginate "git diff" by default is often irritating
    when you do not have any change (or very small change) in your working
    tree.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git-apply: prepare for upcoming GNU diff -u format change.

    Linus Torvalds committed with Junio C Hamano Oct 20, 2006
    The latest GNU diff from CVS emits an empty line to express
    an empty context line, instead of more traditional "single
    white space followed by a newline".  Do not get broken by it.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 19, 2006
  1. Add revspec documentation for ':path', ':[0-3]:path' and git-describe

    pclouds committed with Junio C Hamano Oct 19, 2006
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Reject hexstring longer than 40-bytes in get_short_sha1()

    pclouds committed with Junio C Hamano Oct 19, 2006
    Such a string can never be a valid object name.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. reduce delta head inflated size

    Nicolas Pitre committed with Junio C Hamano Oct 18, 2006
    Supposing that both the base and result sizes were both full size 64-bit
    values, their encoding would occupy only 9.2 bytes each.  Therefore
    inflating 64 bytes is way overkill.  Limit it to 20 bytes instead which
    should be plenty enough for a couple years to come.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 18, 2006
  1. git-imap-send: Strip smtp From_ header from imap message.

    amsler committed with Junio C Hamano Oct 12, 2006
    Cyrus imap refuses messages with a 'From ' Header.
    
    [jc: Mike McCormack says this is fine with Courier as well.]
    
    Signed-off-by: Markus Amsler <markus.amsler@oribi.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 17, 2006
  1. add proper dependancies on the xdiff source

    awhitcroft committed with Junio C Hamano Oct 17, 2006
    We are not rebuilding the xdiff library when its header files change.
    Add dependancies for those to the main Makefile.
    
    Signed-off-by: Andy Whitcroft <apw@shadowen.org>
    Acked-by: Ryan Anderson <ryan@google.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Merge branch 'maint'

    Junio C Hamano committed Oct 17, 2006
    * maint:
      Fix hash function in xdiff library
  3. Fix hash function in xdiff library

    Linus Torvalds committed with Junio C Hamano Oct 17, 2006
    Jim Mayering noticed that xdiff library took insanely long time
    when comparing files with many identical lines.
    
    This was because the hash function used in the library is broken
    on 64-bit architectures and caused too many collisions.
    
    http://thread.gmane.org/gmane.comp.version-control.git/28962/focus=28994
    
    Acked-by: Davide Libenzi <davidel@xmaliserver.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 16, 2006
  1. svnimport: Fix broken tags being generated

    Petr Baudis committed with Junio C Hamano Oct 16, 2006
    Currently git-svnimport generates broken tags missing the timespec in the
    'tagger' line. This is a random stab at a minimal fix.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 15, 2006
  1. Replace open-coded version of hash_sha1_file()

    Rene Scharfe committed with Junio C Hamano Oct 15, 2006
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Make write_sha1_file_prepare() void

    Rene Scharfe committed with Junio C Hamano Oct 15, 2006
    Move file name generation from write_sha1_file_prepare() to the one
    caller that cares and make it a void function.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Revert "move pack creation to version 3"

    Junio C Hamano committed Oct 15, 2006
    This reverts commit 1685457.
    Git as recent as v1.1.6 do not understand version 3 delta.
    
    v1.2.0 is Ok and I personally would say it is old enough, but
    the improvement between version 2 and version 3 delta is not
    bit enough to justify breaking older clients.
    
    We should resurrect this later, but when we do so we shold
    make it conditional.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Merge branch 'jc/http'

    Junio C Hamano committed Oct 15, 2006
    * jc/http:
      Add WEBDAV timeout to http-fetch.
  5. clone: the given repository dir should be relative to $PWD

    yashi committed with Junio C Hamano Oct 14, 2006
    the repository argument for git-clone should be relative to $PWD
    instead of the given target directory.  The old behavior gave us
    surprising success and you need a few minute to know why it worked.
    
    GIT_DIR is already exported so no need to cd into $D. And this makes
    $PWD for git-fetch-pack, which is the actual command to take the given
    repository dir, the same as git-clone.
    
    Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. cvsserver: fix "cvs diff" in a subdirectory

    dscho committed with Junio C Hamano Oct 10, 2006
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. cvsserver: Show correct letters for modified, removed and added files

    dscho committed with Junio C Hamano Oct 10, 2006
    Earlier, cvsserver showed always an 'U', sometimes even without a space
    between the 'U' and the name. Now, the correct letter is shown, with a
    space.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. git-svn: reduce memory usage for large commits

    Eric Wong committed with Junio C Hamano Oct 14, 2006
    apply_textdelta and send_stream can use a separate pool from the
    rest of the editor interface, so we'll use a separate SVN::Pool
    for them and clear the pool after each file is sent to SVN.
    
    This drastically reduces memory usage per-changeset committed,
    and makes large commits (and initial imports) of several
    thousand files possible.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 14, 2006
  1. Fix tracing when GIT_TRACE is set to an empty string.

    chriscool committed with Junio C Hamano Oct 14, 2006
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Make write_sha1_file_prepare() static

    Rene Scharfe committed with Junio C Hamano Oct 14, 2006
    There are no callers of write_sha1_file_prepare() left outside of
    sha1_file.c, so make it static.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Add hash_sha1_file()

    Rene Scharfe committed with Junio C Hamano Oct 14, 2006
    Most callers of write_sha1_file_prepare() are only interested in the
    resulting hash but don't care about the returned file name or the header.
    This patch adds a simple wrapper named hash_sha1_file() which does just
    that, and converts potential callers.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-svn: fix commits over svn+ssh://

    Eric Wong committed with Junio C Hamano Oct 14, 2006
    Once a get_commit_editor has been called from an SVN session, RA
    layer operations are not allowed (well, unless you're using
    file:// or http(s)://).  So we'll pass an alternate SVN::Ra
    object to our editor object for running 'check-path'.
    
    This should fix commits over svnserve (svn:// without ssh, too).
    
    Closes Debian bug #392702, thanks to Pierre Habouzit for
    reporting the bug.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 13, 2006
  1. t4015: work-around here document problem on Cygwin.

    Junio C Hamano committed with Junio C Hamano Oct 13, 2006
    Signed-off-by: Junio C Hamano <junio@twinsun.com>
Commits on Oct 12, 2006
  1. Documentation: add missing second colons and remove a typo

    Rene Scharfe committed with Junio C Hamano Oct 12, 2006
    It takes two colons to mark text as item label.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. diff: fix 2 whitespace issues

    dscho committed with Junio C Hamano Oct 12, 2006
    When whitespace or whitespace change was ignored, the function
    xdl_recmatch() returned memcmp() style differences, which is wrong,
    since it should return 0 on non-match.
    
    Also, there were three horrible off-by-one bugs, even leading to wrong
    hashes in the whitespace special handling.
    
    The issue was noticed by Ray Lehtiniemi.
    
    For good measure, this commit adds a test.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. apply --numstat -z: line termination fix.

    Junio C Hamano committed Oct 12, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-svn: add a message encouraging use of SVN::* libraries

    Eric Wong committed with Junio C Hamano Oct 12, 2006
    I'm using svn 1.4.0-4 in Debian unstable and apparently there's
    a regression on the SVN side that prevents a symlink from
    becoming a regular file (which git supports, of course).
    
    It's not a noticeable regression for most people, but this broke
    the full-svn-tests target in t/Makefile for me.
    
    The SVN::* Perl libraries seem to have matured and improved over
    the past year, and git-svn has supported them for several months
    now, so with that I encourage all users to start using the
    SVN::* Perl libraries with git-svn.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. commit: fix a segfault when displaying a commit with unreachable parents

    Eric Wong committed with Junio C Hamano Oct 11, 2006
    I was running git show on various commits found by fsck-objects
    when I found this bug.  Since find_unique_abbrev() cannot find
    an abbreviation for an object not in the database, it will
    return NULL, which is bad to run strlen() on.  So instead, we'll
    just display the unabbreviated sha1 that we referenced in the
    commit.
    
    I'm not sure that this is the best 'fix' for it because the
    commit I was trying to show was broken, but I don't think a
    program should segfault even if the user tries to do something
    stupid.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 11, 2006
  1. git-svn: -h(elp) message formatting fixes

    Eric Wong committed with Junio C Hamano Oct 11, 2006
    'graft-branches' is slightly longer than the rest of the
    commands, so the text was squished together in the formatted
    output.  This patch just adds some more whitespace to make
    the text look more pleasant.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Documentation/git-svn: document some of the newer features

    Eric Wong committed with Junio C Hamano Oct 11, 2006
    I've forgotten to document many of the features added along the
    way in the manpages.  This fills in some holes in the
    documentation and adds updates some outdated information.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. git-svn: log command fixes

    Eric Wong committed with Junio C Hamano Oct 11, 2006
    Change the --verbose flag to more closely match svn.  I was
    somehow under the impression that --summary included --raw diff
    output, but I was wrong.  We now pass -r --raw --name-status as
    arguments if passed -v/--verbose.
    
    -r (recursive) is passed by default, since users usually want
    it, and accepting it causes difficulty with the -r<revision>
    option used by svn users.  A --non-recursive switch has been
    added to disable this.
    
    Of course, --summary, --raw, -p and any other git-log options
    can still be passed directly (without --name-status).
    
    Also, several warnings about referencing undefined variables
    have been fixed.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-svn: multi-init saves and reuses --tags and --branches arguments

    Eric Wong committed with Junio C Hamano Oct 11, 2006
    This should make it much easier to track newly added tags and
    branches.  Re-running multi-init without command-line arguments
    should now detect new-tags and branches.
    
    --trunk shouldn't change often, but running multi-init on it
    is now idempotent.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. atomic write for sideband remote messages

    Nicolas Pitre committed with Junio C Hamano Oct 11, 2006
    It has been a few times that I ended up with such a confusing display:
    
    |remote: Generating pack...
    |remote: Done counting 17 objects.
    |remote: Result has 9 objects.
    |remote: Deltifying 9 objects.
    |remote:  100% (9/9) done
    |remote: Unpacking 9 objects
    |Total 9, written 9 (delta 8), reused 0 (delta 0)
    | 100% (9/9) done
    
    The confusion can be avoided in most cases by writing the remote message
    in one go to prevent interleacing with local messages.  The buffer
    declaration has been moved inside recv_sideband() to avoid extra string
    copies.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. git.spec.in: perl subpackage is installed in perl_vendorlib not vendo…

    Junio C Hamano committed Oct 11, 2006
    …rarch
    
    Signed-off-by: Junio C Hamano <junio@hera.kernel.org>