Permalink
Commits on Apr 20, 2009
  1. GIT 1.6.2.4

    gitster committed Apr 20, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins

    pclouds committed with gitster Apr 20, 2009
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 19, 2009
  1. Merge branch 'ef/maint-fast-export' into maint

    gitster committed Apr 19, 2009
    * ef/maint-fast-export:
      builtin-fast-export.c: handle nested tags
      builtin-fast-export.c: fix crash on tagged trees
      builtin-fast-export.c: turn error into warning
      test-suite: adding a test for fast-export with tag variants
  2. Merge branch 'mm/maint-add-p-quit' into maint

    gitster committed Apr 19, 2009
    * mm/maint-add-p-quit:
      Update git-add.txt according to the new possibilities of 'git add -p'.
      add-interactive: refactor mode hunk handling
      git add -p: new "quit" command at the prompt.
  3. Merge branch 'lt/maint-reflog-expire' into maint

    gitster committed Apr 19, 2009
    * lt/maint-reflog-expire:
      Speed up reflog pruning of unreachable commits
      Clean up reflog unreachability pruning decision
  4. Merge branch 'jc/maint-shared-literally' into maint

    gitster committed Apr 19, 2009
    * jc/maint-shared-literally:
      Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
      t1301-shared-repo: fix forced modes test
  5. Update git-add.txt according to the new possibilities of 'git add -p'.

    moy committed with gitster Apr 16, 2009
    The text is merely cut-and-pasted from git-add--interactive.perl. The
    cut-and-paste also fixes a typo.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. add-interactive: refactor mode hunk handling

    peff committed with gitster Apr 16, 2009
    The original implementation considered the mode separately
    from the rest of the hunks, asking about it outside the main
    hunk-selection loop. This patch instead places a mode change
    as the first hunk in the loop. This has two advantages:
    
      1. less duplicated code (since we use the main selection
         loop). This also cleans up an inconsistency, which is
         that the main selection loop separates options with a
         comma, whereas the mode prompt used slashes.
    
      2. users can now skip the mode change and come back to it,
         search for it (via "/mode"), etc, as they can with other
         hunks.
    
    To facilitate this, each hunk is now marked with a "type".
    Mode hunks are not considered for splitting (which would
    make no sense, and also confuses the split_hunk function),
    nor are they editable. In theory, one could edit the mode
    lines and change to a new mode. In practice, there are only
    two modes that git cares about (0644 and 0755), so either
    you want to move from one to the other or not (and you can
    do that by staging or not staging).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. git add -p: new "quit" command at the prompt.

    moy committed with gitster Apr 10, 2009
    There's already 'd' to stop staging hunks in a file, but no explicit
    command to stop the interactive staging (for the current files and the
    remaining ones).  Of course you can do 'd' and then ^C, but it would be
    more intuitive to allow 'quit' action.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Speed up reflog pruning of unreachable commits

    gitster committed Mar 31, 2009
    Instead of doing the (potentially very expensive) "in_merge_base()"
    check for each commit that might be pruned if it is unreachable, do a
    preparatory reachability graph of the commit space, so that the common
    case of being reachable can be tested directly.
    
    [ Cleaned up a bit and tweaked to actually work.  - Linus ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. Clean up reflog unreachability pruning decision

    torvalds committed with gitster Mar 31, 2009
    This clarifies the pruning rules for unreachable commits by having a
    separate helpder function for the unreachability decision.
    
    It's preparation for actual bigger changes to come to speed up the
    decision when the reachability calculations become a bottleneck.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. builtin-fast-export.c: handle nested tags

    kusma committed with gitster Mar 23, 2009
    When tags that points to tags are passed to fast-export, an error is given,
    saying "Tag [TAGNAME] points nowhere?". This fix calls parse_object() on the
    object before referencing it's tag, to ensure the tag-info is fully initialized.
    In addition, it inserts a comment to point out where nested tags are handled.
    This is consistent with the comment for signed tags.
    
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. builtin-fast-export.c: fix crash on tagged trees

    kusma committed with gitster Mar 23, 2009
    If a tag object points to a tree (or another unhandled type), the commit-
    pointer is left uninitialized and later dereferenced. This patch adds a
    default case to the switch that issues a warning and skips the object.
    
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. builtin-fast-export.c: turn error into warning

    kusma committed with gitster Mar 23, 2009
    fast-import doesn't have a syntax to support tree-objects (and some other
    object-types), so fast-export shouldn't handle them. However, aborting the
    operation is a bit drastic. This patch turns the error into a warning instead.
    
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. test-suite: adding a test for fast-export with tag variants

    kusma committed with gitster Mar 23, 2009
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 18, 2009
  1. Describe fixes since 1.6.2.3

    gitster committed Apr 18, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint-1.6.1' into maint

    gitster committed Apr 18, 2009
    * maint-1.6.1:
  3. Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed Apr 18, 2009
    * maint-1.6.0:
      doc/git-daemon: add missing arguments to options
      init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
  4. Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint

    gitster committed Apr 18, 2009
    * bs/maint-1.6.0-tree-walk-prefix:
      match_tree_entry(): a pathspec only matches at directory boundaries
      tree_entry_interesting: a pathspec only matches at directory boundary
  5. Merge branch 'js/maint-submodule-checkout' into maint

    gitster committed Apr 18, 2009
    * js/maint-submodule-checkout:
      Fix 'git checkout <submodule>' to update the index
  6. Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint

    gitster committed Apr 18, 2009
    * cb/maint-merge-recursive-submodule-fix:
      simplify output of conflicting merge
      update cache for conflicting submodule entries
      add tests for merging with submodules
  7. doc/git-daemon: add missing arguments to max-connections option

    marcows committed with gitster Apr 18, 2009
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Merge branch 'maint-1.6.0' into maint

    gitster committed Apr 18, 2009
    * maint-1.6.0:
      doc/git-daemon: add missing arguments to options
      init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
  9. doc/git-daemon: add missing arguments to options

    marcows committed with gitster Apr 18, 2009
    Also fix some spellings and typos.
    
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. init: Do not segfault on big GIT_TEMPLATE_DIR environment variable

    flichtenheld committed with gitster Apr 18, 2009
    Signed-off-by: Frank Lichtenheld <flichtenheld@astaro.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. imap-send: use correct configuration variable in documentation

    pebolle committed with gitster Apr 18, 2009
    It's imap.pass (not imap.password).
    
    Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. Update docs on behaviour of 'core.sharedRepository' and 'git init --s…

    jherland committed with gitster Apr 14, 2009
    …hared'
    
    This documentation update is needed to reflect the recent changes where
    "core.sharedRepository = 0mode" was changed to set, not loosen, the
    repository permissions.
    
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. doc/gitattributes: clarify location of config text

    peff committed with gitster Apr 16, 2009
    The gitattributes documentation has a section on the "diff"
    attribute, with subsections for each of the things you might
    want to configure in your diff config section (external
    diff, hunk headers, etc). The first such subsection
    specifically notes that the definition of the diff driver
    should go into $GIT_DIR/config, but subsequent sections do
    not.
    
    This location is implied if you are reading the
    documentation sequentially, but it is not uncommon for a new
    user to jump to (or be referred to) a specific section. For
    a new user who does not know git well enough to recognize
    the config syntax, it is not clear that those directives
    don't also go into the gitattributes file.
    
    This patch just mentions the config file in each subsection,
    similar to the way it is mentioned in the first.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. Merge branch 'maint-1.6.1' into maint

    gitster committed Apr 18, 2009
    * maint-1.6.1:
      Fix buffer overflow in config parser
  15. Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed Apr 18, 2009
    * maint-1.6.0:
      Fix buffer overflow in config parser
  16. Fix buffer overflow in config parser

    thomasjfox committed with gitster Apr 17, 2009
    When interpreting a config value, the config parser reads in 1+ space
    character(s) and puts -one- space character in the buffer as soon as
    the first non-space character is encountered (if not inside quotes).
    
    Unfortunately the buffer size check lacks the extra space character
    which gets inserted at the next non-space character, resulting in
    a crash with a specially crafted config entry.
    
    The unit test now uses Java to compile a platform independent
    .NET framework to output the test string in C# :o)
    
        Read: Thanks to Johannes Sixt for the correct printf call
        which replaces the perl invocation.
    
    Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 16, 2009
  1. git-apply: fix option description

    sjvudp committed with gitster Apr 9, 2009
    Do not use non ASCII single quote.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 12, 2009
  1. GIT 1.6.2.3

    gitster committed Apr 12, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint-1.6.1' into maint

    gitster committed Apr 12, 2009
    * maint-1.6.1:
      State the effect of filter-branch on graft explicitly
      process_{tree,blob}: Remove useless xstrdup calls
  3. Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed Apr 12, 2009
    * maint-1.6.0:
      State the effect of filter-branch on graft explicitly
      process_{tree,blob}: Remove useless xstrdup calls