Permalink
Commits on Oct 15, 2006
  1. Merge branch 'jc/http'

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

    yashi authored and Junio C Hamano committed 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>
  3. cvsserver: fix "cvs diff" in a subdirectory

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

    dscho authored and Junio C Hamano committed 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>
  5. git-svn: reduce memory usage for large commits

    Eric Wong Junio C Hamano
    Eric Wong authored and Junio C Hamano committed 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 authored and Junio C Hamano committed 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 Junio C Hamano
    Rene Scharfe authored and Junio C Hamano committed 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 Junio C Hamano
    Rene Scharfe authored and Junio C Hamano committed 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 Junio C Hamano
    Eric Wong authored and Junio C Hamano committed 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 Junio C Hamano
    Junio C Hamano authored and Junio C Hamano committed 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 Junio C Hamano
    Rene Scharfe authored and Junio C Hamano committed 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 authored and Junio C Hamano committed 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
    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 Junio C Hamano
    Eric Wong authored and Junio C Hamano committed 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 Junio C Hamano
    Eric Wong authored and Junio C Hamano committed 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 Junio C Hamano
    Eric Wong authored and Junio C Hamano committed 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 Junio C Hamano
    Eric Wong authored and Junio C Hamano committed 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 Junio C Hamano
    Eric Wong authored and Junio C Hamano committed 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 Junio C Hamano
    Eric Wong authored and Junio C Hamano committed 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 Junio C Hamano
    Nicolas Pitre authored and Junio C Hamano committed 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
    Junio C Hamano committed Oct 11, 2006
    …rarch
    
    Signed-off-by: Junio C Hamano <junio@hera.kernel.org>
  7. git-pull: we say commit X, not X commit.

    Junio C Hamano
    Junio C Hamano committed Oct 11, 2006
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. git-fetch --update-head-ok typofix

    Junio C Hamano
    Junio C Hamano committed Oct 11, 2006
    Martin Waitz noticed that one of the case arms had an impossible
    choice.  It turns out that what it was checking was redundant and
    the typo did not have any effect.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. paginate git-diff by default

    tali authored and Junio C Hamano committed Oct 10, 2006
Commits on Oct 10, 2006
  1. add commit count options to git-shortlog

    Nicolas Pitre Junio C Hamano
    Nicolas Pitre authored and Junio C Hamano committed Oct 6, 2006
    This patch does 3 things:
    
    1) Output the number of commits along with the name for each author
       (nice to know for long lists spending more than a screen worth of
       commit lines).
    
    2) Provide a switch (-n) to sort authors according to their number of
       commits instead of author alphabetic order.
    
    3) Provide a switch (-s) to supress commit lines and only keep a
       summary of authors and the number of commits for each of them.
    
    And for good measure a short usage is displayed with -h.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Fix git-revert

    Junio C Hamano
    Junio C Hamano committed Oct 10, 2006
    Defaulting to $replay for the sake of fixing cherry-pick was not
    done conditionally, which broke git-revert.
    
    Noticed by Luben.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 9, 2006
  1. Add WEBDAV timeout to http-fetch.

    Junio C Hamano
    Junio C Hamano committed Oct 8, 2006
    Sean <seanlkml@sympatico.ca> writes:
    
    > On Sat, 07 Oct 2006 21:52:02 -0700
    > Junio C Hamano <junkio@cox.net> wrote:
    >
    >> Using DAV, if it works with the server, has the advantage of not
    >> having to keep objects/info/packs up-to-date from repository
    >> owner's point of view.  But the repository owner ends up keeping
    >> up-to-date as a side effect of keeping info/refs up-to-date
    >> anyway (as I do not see a code to read that information over
    >> DAV), so there is no point doing this over DAV in practice.
    >>
    >> Perhaps we should remove call to remote_ls() from
    >> fetch_indices() unconditionally, not just protected with
    >> NO_EXPAT and be done with it?
    >
    > That makes a lot of sense.  A server really has to always provide
    > a objects/info/packs anyway, just to be fetchable today by clients
    > that are compiled with NO_EXPAT.
    
    And even for an isolated group where everybody knows that
    everybody else runs DAV-enabled clients, they need info/refs
    prepared for ls-remote and git-fetch script, which means you
    will run update-server-info to keep objects/info/packs up to
    date.
    
    Nick, do you see holes in my logic?
    
    -- >8 --
    http-fetch.c: drop remote_ls()
    
    While doing remote_ls() over DAV potentially allows the server
    side not to keep objects/info/pack up-to-date, misconfigured or
    buggy servers can silently ignore or not to respond to DAV
    requests and makes the client hang.
    
    The server side (unfortunately) needs to run git-update-server-info
    even if remote_ls() removes the need to keep objects/info/pack file
    up-to-date, because the caller of git-http-fetch (git-fetch) and other
    clients that interact with the repository (e.g. git-ls-remote) need to
    read from info/refs file (there is no code to make that unnecessary by
    using DAV yet).
    
    Perhaps the right solution in the longer-term is to make info/refs
    also unnecessary by using DAV, and we would want to resurrect the
    code this patch removes when we do so, but let's drop remote_ls()
    implementation for now.  It is causing problems without really
    helping anything yet.
    
    git will keep it for us until we need it next time.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 8, 2006
  1. gitweb: Cleanup Git logo and Git logo target generation

    jnareb authored and Junio C Hamano committed Oct 6, 2006
    Rename $githelp_url and $githelp_label to $logo_url and $logo_label to
    be more obvious what they refer to; while at it add commented out
    previous contents (git documentation at kernel.org). Add comment about
    logo size.
    
    Use $cgi->a(...) to generate Git logo link; it automatically escapes
    attribute values when it is needed.  Escape href attribute using
    esc_url instead of (incorrect!) esc_html.
    
    Move styling of git logo <img> element from "style" attribute to CSS
    via setting class to "logo".  Perhaps we should set it by id rather
    than by class.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-tar-tree: don't RUN_SETUP

    Rene Scharfe Junio C Hamano
    Rene Scharfe authored and Junio C Hamano committed Oct 8, 2006
    Noted by Jiri Slaby, git-tar-tree --remote doesn't need to be run
    from inside of a git archive.  Since git-tar-tree is now only a
    wrapper for git-archive, which calls setup_git_directory() as
    needed, we should drop the flag RUN_SETUP.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. test-lib: separate individual test better in verbose mode.

    tali authored and Junio C Hamano committed Oct 7, 2006
    When running tests with --verbose it is difficult to see where
    one test starts and where it ends because everything is printed
    in one big lump.
    Fix that by printing one single newline between each test.
    
    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. git-commit: fix coding style.

    tali authored and Junio C Hamano committed Oct 7, 2006
    git-commit.sh was using a mixture of spaces and tabs for indentation.
    This is changed to one tab per indentation level.
    No code changes.
    
    Signed-off-by: Martin Waitz <tali@admingilde.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 7, 2006
  1. gitweb: [commit view] Do not suppress commitdiff link in root commit

    Petr Baudis Junio C Hamano
    Petr Baudis authored and Junio C Hamano committed Oct 6, 2006
    There's no reason for that, the commitdiff view is meaningful for the
    root commit as well and we link to it everywhere else.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. gitweb: Handle commits with empty commit messages more reasonably

    Petr Baudis Junio C Hamano
    Petr Baudis authored and Junio C Hamano committed Oct 6, 2006
    Currently those look very weird, you can't get easily at the commit view
    etc. This patch makes their title '(no commit message)'.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. gitweb: Separate (new) and (deleted) in commitdiff by a space

    Petr Baudis Junio C Hamano
    Petr Baudis authored and Junio C Hamano committed Oct 6, 2006
    Currently it's pasted to the sha1 of the blob and looks ugly.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Show snapshot link in shortlog only if have_snapsho

    Petr Baudis Junio C Hamano
    Petr Baudis authored and Junio C Hamano committed Oct 6, 2006
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>