Permalink
Commits on Oct 24, 2006
  1. gitweb: Fix setting $/ in parse_commit()

    If the commit couldn't have been read, $/ wasn't restored to \n properly,
    causing random havoc like git_get_ref_list() returning the ref names with
    trailing \n.
    
    Aside of potential confusion in the body of git_search(), no other $/
    surprises are hopefully hidden in the code.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Oct 24, 2006
  2. daemon: do not die on older clients.

    In the older times, the clients did not say which host they were trying
    to connect, and the code we recently added did not quite handle the
    older clients correctly.
    
    Noticed by Simon Arlott.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 24, 2006
Commits on Oct 23, 2006
  1. @meyering

    xdiff/xemit.c (xdl_find_func): Elide trailing white space in a contex…

    …t header.
    
    This removes trailing blanks from git-generated diff headers
    the same way a similar patch did that for GNU diff:
    
      http://article.gmane.org/gmane.comp.gnu.utils.bugs/13839
    
    That is, it removes trailing blanks on the hunk header line that
    shows the function name.
    
    Signed-off-by: Jim Meyering <jim@meyering.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    meyering committed with Junio C Hamano Oct 23, 2006
  2. @meyering

    git-clone: honor --quiet

    I noticed that a cron-launched "git-clone --quiet" was generating
    progress output to standard error -- and thus always spamming me.
    The offending output was due to git-clone invoking git-read-tree with
    its undocumented -v option.
    This change turns off "-v" for --quiet.
    
    Signed-off-by: Jim Meyering <jim@meyering.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    meyering committed with Junio C Hamano Oct 23, 2006
  3. Documentation for the [remote] config

    Signed-off-by: Santi Béjar <sbejar@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Santi Béjar committed with Junio C Hamano Oct 23, 2006
  4. @julliard

    prune-packed: Fix uninitialized variable.

    The dryrun variable was made local instead of static by the previous
    commit, and local variables aren't initialized to zero.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    julliard committed with Junio C Hamano Oct 23, 2006
  5. pager: default to LESS=FRSX not LESS=FRS

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 23, 2006
Commits on Oct 22, 2006
  1. Make prune also run prune-packed

    Both the git-prune manpage and everday.txt say that git-prune should also prune
    unpacked objects that are also found in packs, by running git prune-packed.
    
    Junio thought this was "a regression when prune was rewritten as a built-in."
    
    So modify prune to call prune-packed again.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    J. Bruce Fields committed with Junio C Hamano Oct 22, 2006
  2. git-vc: better installation instructions

    Provide some more detailed installation instructions, for the
    elisp-challenged among us.
    
    Signed-off-by: Karl Hasselström <kha@treskal.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Karl Hasselström committed with Junio C Hamano Oct 22, 2006
  3. @jnareb

    gitweb: Do not esc_html $basedir argument to git_print_tree_entry

    In git_tree, rename $base variable (which is passed as $basedir
    argument to git_print_tree_entry) to $basedir. Do not esc_html
    $basedir, as it is part of file_name ('f') argument in link and not
    printed. Add '/' at the end only if $basedir is not empty (it is empty
    for top directory) and doesn't end in '/' already.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jnareb committed with Junio C Hamano Oct 21, 2006
  4. @jnareb

    gitweb: Whitespace cleanup - tabs are for indent, spaces are for alig…

    …n (2)
    
    Code should be aligned the same way, regardless of tab size.
    Use tabs for indent, but spaces for align.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jnareb committed with Junio C Hamano Oct 21, 2006
  5. @hjemli

    Fix usagestring for git-branch

    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    hjemli committed with Junio C Hamano Oct 22, 2006
  6. git-merge: show usage if run without arguments

    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Rene Scharfe committed with Junio C Hamano Oct 21, 2006
Commits on Oct 20, 2006
  1. @hjemli

    Fix typo in show-index.c

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

    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>
    Junio C Hamano committed Oct 20, 2006
  3. git-apply: prepare for upcoming GNU diff -u format change.

    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>
    Linus Torvalds committed with Junio C Hamano Oct 20, 2006
Commits on Oct 19, 2006
  1. @pclouds

    Add revspec documentation for ':path', ':[0-3]:path' and git-describe

    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    pclouds committed with Junio C Hamano Oct 19, 2006
  2. @pclouds

    Reject hexstring longer than 40-bytes in get_short_sha1()

    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>
    pclouds committed with Junio C Hamano Oct 19, 2006
  3. reduce delta head inflated size

    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>
    Nicolas Pitre committed with Junio C Hamano Oct 18, 2006
Commits on Oct 18, 2006
  1. @amsler

    git-imap-send: Strip smtp From_ header from imap message.

    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>
    amsler committed with Junio C Hamano Oct 12, 2006
Commits on Oct 17, 2006
  1. @awhitcroft

    add proper dependancies on the xdiff source

    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>
    awhitcroft committed with Junio C Hamano Oct 17, 2006
  2. Merge branch 'maint'

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

    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>
    Linus Torvalds committed with Junio C Hamano Oct 17, 2006
Commits on Oct 16, 2006
  1. svnimport: Fix broken tags being generated

    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>
    Petr Baudis committed with Junio C Hamano Oct 16, 2006
Commits on Oct 15, 2006
  1. Replace open-coded version of hash_sha1_file()

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

    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>
    Rene Scharfe committed with Junio C Hamano Oct 15, 2006
  3. Revert "move pack creation to version 3"

    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>
    Junio C Hamano committed Oct 15, 2006
  4. Merge branch 'jc/http'

    * jc/http:
      Add WEBDAV timeout to http-fetch.
    Junio C Hamano committed Oct 15, 2006
  5. @yashi

    clone: the given repository dir should be relative to $PWD

    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>
    yashi committed with Junio C Hamano Oct 14, 2006
  6. @dscho

    cvsserver: fix "cvs diff" in a subdirectory

    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 10, 2006
  7. @dscho

    cvsserver: Show correct letters for modified, removed and added files

    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>
    dscho committed with Junio C Hamano Oct 10, 2006
  8. git-svn: reduce memory usage for large commits

    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>
    Eric Wong committed with Junio C Hamano Oct 14, 2006
Commits on Oct 14, 2006
  1. @chriscool

    Fix tracing when GIT_TRACE is set to an empty string.

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

    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>
    Rene Scharfe committed with Junio C Hamano Oct 14, 2006
  3. Add hash_sha1_file()

    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>
    Rene Scharfe committed with Junio C Hamano Oct 14, 2006