Permalink
Commits on Jul 25, 2006
  1. cvsserver: avoid warning about active db handles

    dscho committed with Junio C Hamano Jul 25, 2006
    Turns out that DBD::SQLite does not favour preparing statements which are
    never executed. So, turn all 4 statements, which were prepared _always_,
    into methods, like the other 12 prepared statements.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. cvsserver: suppress warnings

    dscho committed with Junio C Hamano Jul 25, 2006
    This patch defines $state->{prependdir} as the empty string, so that
    quite a few warnings are avoided.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Acked-by: Martin Langhoff <martin@catalyst.net.nz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Substitute xmalloc()+memset(0) with xcalloc().

    Peter Eriksen committed with Junio C Hamano Jul 25, 2006
    Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. gitweb: escape tag comments

    Daniel Drake committed with Junio C Hamano Jul 24, 2006
    I have a tag with a comment which includes an & character. Firefox wouldn't
    display my gitweb summary page due to malformed XML. This solves the problem.
    
    Signed-off-by: Daniel Drake <dsd@gentoo.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Merge branch 'jc/clone-bind-failure'

    Junio C Hamano committed Jul 25, 2006
    * jc/clone-bind-failure:
      fetch/clone: check return status from ls-remote
  6. Merge branch 'jt/format-patch'

    Junio C Hamano committed Jul 25, 2006
    * jt/format-patch:
      builtin-log: typefix for recent format-patch changes.
      Add option to set initial In-Reply-To/References
      Add option to enable threading headers
      git-format-patch: Make the second and subsequent mails replies to the first
  7. Merge branch 'ew/apply'

    Junio C Hamano committed Jul 25, 2006
    * ew/apply:
      Fix t4114 on cygwin
      apply: handle type-changing patch correctly.
      apply: split out removal and creation into different phases.
      apply: check D/F conflicts more carefully.
      typechange tests for git apply (currently failing)
  8. Merge branch 'jc/read-tree'

    Junio C Hamano committed Jul 25, 2006
    * jc/read-tree:
      checkout -f failed to check out a file if an existing directory interfered.
  9. Merge branch 'lt/objformat'

    Junio C Hamano committed Jul 25, 2006
    * lt/objformat:
      sha1_file: add the ability to parse objects in "pack file format"
  10. Trivial path optimization test

    Alex Riesen committed with Junio C Hamano Jul 24, 2006
    Linus:
        get_pathspec() does turn '.' into an empty string (which is
        correct - git internally does _not_ ever understand the notion of
        "." as the current working directory), but it doesn't ever do the
        optimization of noticing that a pathspec that consists solely of
        an empty string is "equivalent" to an empty pathspec.
    
    The test is to ensure that this behaviour stays.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jul 24, 2006
  1. Always reset the color _before_ printing out the newline

    dscho committed with Junio C Hamano Jul 24, 2006
    This patch brings the benefits of part of v1.4.1-rc2~37
    to the "commit" colorizing patch.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. upload-pack: fix timeout in create_pack_file

    matled committed with Junio C Hamano Jul 18, 2006
    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Defaulting fetch to origin when set in the repo-config

    Santi Béjar committed with Junio C Hamano Jul 22, 2006
    Signed-off-by: Santi Béjar <sbejar@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Colorize 'commit' lines in log ui

    peff committed with Junio C Hamano Jul 23, 2006
    When paging through the output of git-whatchanged, the color cues help to
    visually navigate within a diff. However, it is difficult to notice when a
    new commit starts, because the commit and log are shown in the "normal"
    color. This patch colorizes the 'commit' line, customizable through
    diff.colors.commit and defaulting to yellow.
    
    As a side effect, some of the diff color engine (slot enum, get_color) has
    become accessible outside of diff.c.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. git-am: Don't accept an mbox on stdin of we already have a .dotest di…

    Lukas Sandström committed with Junio C Hamano Jul 19, 2006
    …rectory
    
    It makes no sense to accept an mbox via stdin when we
    won't accept it on the commandline.
    
    The patch helps the following scenario:
    
    # git init-db
    "add file1 with content"
    # git checkout -b apply
    "edit file1 && commit"
    
    # git checkout -b conflict master
    "edit file1 && commit"
    
    # git checkout -b ok master
    "add file2"
    
    # git checkout apply
    # git format-patch -k -3 master..conflict | git am -k -3
    => git-am fails with a conflict message
    # git reset --hard
    
    # git format-patch -k -3 master..ok | git am -k -3
    => git am fails with the same conflict message as above,
    => since it's trying to apply the old .dotest directory
    
    With the patch it complains about an old .dotest
    directory instead.
    
    Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. show-branch: Fix another performance problem.

    julliard committed with Junio C Hamano Jul 23, 2006
    When naming commits, stop walking the parent chain as soon as we find
    a commit that already has a name. The parent chain of that commit will
    be walked later on in any case (or may even have been walked already).
    This avoids O(n^2) behavior; on a tree where show-branch displays 6800
    commits, the total run time drops from 77 seconds to 5 seconds.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. pack-objects: check pack.window for default window size

    peff committed with Junio C Hamano Jul 23, 2006
    For some repositories, deltas simply don't make sense. One can disable
    them for git-repack by adding --window, but git-push insists on making
    the deltas which can be very CPU-intensive for little benefit.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Disable linking with Fink or DarwinPorts.

    spearce committed with Junio C Hamano Jul 24, 2006
    It may be desirable for the compiler to disable linking against Fink
    or DarwinPorts, especially if both are installed on the system and
    the user wants GIT to be linked specifically to only one of them.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. git.el: Put the git customize group in the 'tools' parent group.

    julliard committed with Junio C Hamano Jul 22, 2006
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. git.el: Try to reuse an existing buffer when running git-status.

    julliard committed with Junio C Hamano Jul 22, 2006
    By default, running git-status again will now reuse an existing buffer
    that displays the same directory. The old behavior of always creating
    a new buffer can be obtained by customizing the git-reuse-status-buffer
    option.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. git.el: Prepend a slash to the file name when adding to .gitignore.

    julliard committed with Junio C Hamano Jul 22, 2006
    This way the ignore command will really only ignore the marked files
    and not files with the same name in subdirectories.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. git.el: Run git-rerere on commits if the rr-cache directory exists.

    julliard committed with Junio C Hamano Jul 22, 2006
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. git-svn: fix fetching new directories copies when using SVN:: libs

    Eric Wong committed with Junio C Hamano Jul 20, 2006
    Log output from SVN doesn't list all the new files that were
    added if a new directory was copied from an existing place in
    the repository.  This means we'll have to do some extra work and
    traverse new directories ourselves.
    
    This has been updated from the original patch to defer traversed
    adds until all removals have been done.  Please disregard the
    original.
    
    Thanks to Ben Williamson for the excellent bug report and
    testing.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  14. tar-tree: add the "tar.umask" config option

    Willy Tarreau committed with Junio C Hamano Jul 20, 2006
    By default, git-tar-tree(1) sets file and directories modes to 0666
    or 0777. While this is both useful and acceptable for projects such
    as the Linux Kernel, it might be excessive for other projects. With
    this variable, it becomes possible to tell git-tar-tree(1) to apply
    a specific umask to the modes above. The special value "user"
    indicates that the user's current umask will be used. This should be
    enough for most projects, as it will lead to the same permissions as
    git-checkout(1) would use. The default value remains 0, which means
    world read-write.
    
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    Acked-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  15. Fix t4114 on cygwin

    dscho committed with Junio C Hamano Jul 18, 2006
    On cygwin, when you try to create a symlink over a directory, you do
    not get EEXIST, but EACCES.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  16. cvsexportcommit - add -a (add author line) flag, cleanup warnings

    Martin Langhoff committed with Junio C Hamano Jul 18, 2006
    This patch adds support for -a which will add an "Author: " line, and possibly
    a "Committer: " line to the bottom of the commit message for CVS.
    
    The commit message parser is now a little bit better, and some warnings
    have been cleaned up.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jul 17, 2006
  1. unpack-objects: remove stale and confusing comment

    Junio C Hamano committed Jul 17, 2006
    The very initial version of unpack-objects.c::unpack_all() used
    to unpack from the end of the pack, but since end of June last
    year it was changed to stream from the front and the comment
    does not reflect the reality anymore.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-fetch: fix --keep vs --thin

    Junio C Hamano committed Jul 17, 2006
    When --keep is specified there is no reason to pass --thin to git-fetch-pack,
    which are mutually exclusive.  This does not hurt because fetch-pack disables
    thin transfer when both are given internally, but still is confusing.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Merge branch 'sp/reflog'

    Junio C Hamano committed Jul 17, 2006
    * sp/reflog:
      Record rebase changes as 'rebase' in the reflog.
      Log ref changes made by resolve.
      Log ref changes made by quiltimport.
      Log ref changes made by git-merge and git-pull.
  4. apply: handle type-changing patch correctly.

    Junio C Hamano committed Jul 17, 2006
    A type-change diff is always split into a patch to delete old,
    immediately followed by a patch to create new.  check_patch()
    routine noticed that the path to be created already exists in
    the working tree and/or in the index when looking at the
    creation patch and mistakenly thought it to be an error.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. apply: split out removal and creation into different phases.

    Junio C Hamano committed Jul 17, 2006
    This reworks write_out_result() loop so we first remove the paths that
    are to go away and then create them after finishing all the removal.
    
    This is necessary when a patch creates a file "foo" and removes a file
    "foo/bar".
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. apply: check D/F conflicts more carefully.

    Junio C Hamano committed Jul 17, 2006
    When creating a new file where a directory used to be (or the user had
    an empty directory) the code did not check the result from lstat() closely
    enough, and mistakenly thought the path already existed in the working tree.
    
    This does not fix the problem where you have a patch that creates a file
    at "foo" and removes a file at "foo/bar" (which presumably is the last file
    in "foo/" directory in the original).  For that, we would need to restructure
    write_out_results() loop.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. checkout -f failed to check out a file if an existing directory inter…

    Junio C Hamano committed Jul 17, 2006
    …fered.
    
    When path foo/bar existed in the working tree, checkout -f to switch to
    a branch that has a file foo silently did a wrong thing.  It failed to
    remove the directory foo, did not check out the file foo, and the worst
    of all it did not report any errors.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. typechange tests for git apply (currently failing)

    Eric Wong committed with Junio C Hamano Jul 16, 2006
    I've found that git apply is incapable of handling patches
    involving object type changes to the same path.
    
    Of course git itself is perfectly capable of making commits that
    generate these changes, as it only tracks trees states.  It's
    just that the diffs between them are less useful if they can't
    be applied.
    
    Some of these are rare, but I've hit one of them (file becoming
    a symlink) recently in real-world usage, and was inspired to
    find more potential breakages :)
    
    I'm not sure when I'll have time to fix these myself and I'm not
    very familiar with the apply code.   So if someone could get
    some or all of these cases working, they would be my hero :)
    
    Some of these are what I would refer to as corner-cases from
    hell.  Most (if not all) other systems fail some of these.  In
    fact, they aren't even capable of representing most of these
    changes in their histories; much less being able to handle
    patches to that effect.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jul 16, 2006
  1. git-svn: don't check for migrations/upgrades on commit-diff

    Eric Wong committed with Junio C Hamano Jul 15, 2006
    Unlike other git-svn commands, commit-diff is intended to
    operate without needing any additional metadata inside .git
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>