Permalink
Commits on May 3, 2009
  1. GIT 1.6.1.4

    gitster committed May 3, 2009
    With a handful of fixes backmerged from 1.6.2.X series
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1

    gitster committed May 3, 2009
    * jc/maint-1.6.0-keep-pack:
      pack-objects: don't loosen objects available in alternate or kept packs
      t7700: demonstrate repack flaw which may loosen objects unnecessarily
      Remove --kept-pack-only option and associated infrastructure
      pack-objects: only repack or loosen objects residing in "local" packs
      git-repack.sh: don't use --kept-pack-only option to pack-objects
      t7700-repack: add two new tests demonstrating repacking flaws
      is_kept_pack(): final clean-up
      Simplify is_kept_pack()
      Consolidate ignore_packed logic more
      has_sha1_kept_pack(): take "struct rev_info"
      has_sha1_pack(): refactor "pretend these packs do not exist" interface
      git-repack: resist stray environment variable
  3. Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1

    gitster committed May 3, 2009
    * jc/maint-1.6.0-diff-borrow-carefully:
      diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged
  4. Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1

    gitster committed May 3, 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
Commits on Apr 29, 2009
  1. Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed Apr 29, 2009
    * maint-1.6.0:
      diff -c -p: do not die on submodules
  2. diff -c -p: do not die on submodules

    gitster committed Apr 29, 2009
    The combine diff logic knew only about blobs (and their checked-out form
    in the work tree, either regular files or symlinks), and barfed when fed
    submodules.  This "externalizes" gitlinks in the same way as the normal
    patch generation codepath does (i.e. "Subproject commit Xxx\n") to fix the
    issue.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 28, 2009
  1. Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed Apr 28, 2009
    * maint-1.6.0:
      grep: fix segfault when "git grep '('" is given
      Documentation: fix a grammatical error in api-builtin.txt
      builtin-merge: fix a typo in an error message
  2. grep: fix segfault when "git grep '('" is given

    torvalds committed with gitster Apr 27, 2009
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 27, 2009
  1. Documentation: fix a grammatical error in api-builtin.txt

    allancaffee committed with gitster Apr 13, 2009
    Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. builtin-merge: fix a typo in an error message

    allancaffee committed with gitster Apr 13, 2009
    Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
    Acked-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 25, 2009
  1. Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed Apr 25, 2009
    * maint-1.6.0:
      test-genrandom: Add newline to usage string
Commits on Apr 23, 2009
  1. test-genrandom: Add newline to usage string

    bebarino committed with gitster Apr 23, 2009
    A minor fix to place the terminal input on a new line if test-genrandom
    is run with no arguments.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 18, 2009
  1. 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
  2. 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>
  3. 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>
  4. 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
  5. 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 12, 2009
  1. 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
  2. State the effect of filter-branch on graft explicitly

    j16sdiz committed with gitster Apr 10, 2009
    Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. process_{tree,blob}: Remove useless xstrdup calls

    torvalds committed with gitster Apr 10, 2009
    On Wed, 8 Apr 2009, Björn Steinbrink wrote:
    >
    > The name of the processed object was duplicated for passing it to
    > add_object(), but that already calls path_name, which allocates a new
    > string anyway. So the memory allocated by the xstrdup calls just went
    > nowhere, leaking memory.
    
    Ack, ack.
    
    There's another easy 5% or so for the built-in object walker: once we've
    created the hash from the name, the name isn't interesting any more, and
    so something trivial like this can help a bit.
    
    Does it matter? Probably not on its own. But a few more memory saving
    tricks and it might all make a difference.
    
    		Linus
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 9, 2009
  1. Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed Apr 9, 2009
    * maint-1.6.0:
      process_{tree,blob}: Remove useless xstrdup calls
  2. Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1

    gitster committed Apr 9, 2009
    * jc/maint-1.6.0-blame-s:
      blame: read custom grafts given by -S before calling setup_revisions()
    
    Conflicts:
    	builtin-blame.c
  3. Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1

    gitster committed Apr 9, 2009
    * bc/maint-1.6.1-branch-deleted-was:
      git-branch: display "was sha1" on branch deletion rather than just "sha1"
  4. Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1

    gitster committed Apr 9, 2009
    * js/maint-1.6.0-exec-path-env:
      Propagate --exec-path setting to external commands via GIT_EXEC_PATH
  5. Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1

    gitster committed Apr 9, 2009
    * tr/maint-1.6.1-doc-format-patch--root:
      Documentation: format-patch --root clarifications
  6. process_{tree,blob}: Remove useless xstrdup calls

    dotdash committed with gitster Apr 8, 2009
    The name of the processed object was duplicated for passing it to
    add_object(), but that already calls path_name, which allocates a new
    string anyway. So the memory allocated by the xstrdup calls just went
    nowhere, leaking memory.
    
    This reduces the RSS usage for a "rev-list --all --objects" by about 10% on
    the gentoo repo (fully packed) as well as linux-2.6.git:
    
        gentoo:
                        | old           | new
        ----------------|-------------------------------
        RSS             |       1537284 |       1388408
        VSZ             |       1816852 |       1667952
        time elapsed    |       1:49.62 |       1:48.99
        min. page faults|        417178 |        379919
    
        linux-2.6.git:
                        | old           | new
        ----------------|-------------------------------
        RSS             |        324452 |        292996
        VSZ             |        491792 |        460376
        time elapsed    |       0:14.53 |       0:14.28
        min. page faults|         89360 |         81613
    
    Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 8, 2009
  1. Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed Apr 8, 2009
    * maint-1.6.0:
      Documentation: clarify .gitattributes search
      git-checkout.txt: clarify that <branch> applies when no path is given.
      git-checkout.txt: fix incorrect statement about HEAD and index
  2. Documentation: clarify .gitattributes search

    jicama committed with gitster Apr 6, 2009
    Use the term "toplevel of the work tree" in gitattributes.txt and
    gitignore.txt to define the limits of the search for those files.
    
    Signed-off-by: Jason Merrill <jason@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. git-checkout.txt: clarify that <branch> applies when no path is given.

    moy committed with gitster Apr 7, 2009
    Otherwise, the sentence "Defaults to HEAD." can be mis-read to mean
    that "git checkout -- hello.c" checks-out from HEAD.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. git-checkout.txt: fix incorrect statement about HEAD and index

    moy committed with gitster Apr 6, 2009
    The command "git checkout" checks out from the index by default, not
    HEAD (the introducing comment were correct, but the detailled
    explanation added below were not).
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 5, 2009
  1. Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed Apr 5, 2009
    * maint-1.6.0:
      commit: abort commit if interactive add failed
      git-repack: use non-dashed update-server-info
    
    Conflicts:
    	builtin-commit.c
  2. commit: abort commit if interactive add failed

    peff committed with gitster Apr 3, 2009
    Previously we ignored the result of calling add_interactive,
    which meant that if an error occurred we simply committed
    whatever happened to be in the index.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. git-repack: use non-dashed update-server-info

    toofishes committed with gitster Apr 4, 2009
    Signed-off-by: Dan McGee <dpmcgee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 2, 2009
  1. Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed Apr 2, 2009
    * maint-1.6.0:
      Documentation: Remove an odd "instead"
  2. match_tree_entry(): a pathspec only matches at directory boundaries

    gitster committed Apr 2, 2009
    Previously the code did a simple prefix match, which means that a path in
    a directory "frotz/" would have matched with pathspec "f".
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>