Permalink
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
  4. State the effect of filter-branch on graft explicitly

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

    torvalds authored and gitster committed 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. Start 1.6.2.3 preparation

    gitster committed Apr 9, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/shared-literally' into maint

    gitster committed Apr 9, 2009
    * jc/shared-literally:
      t1301: loosen test for forced modes
      set_shared_perm(): sometimes we know what the final mode bits should look like
      move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath
      Move chmod(foo, 0444) into move_temp_to_file()
      "core.sharedrepository = 0mode" should set, not loosen
  3. Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint

    gitster committed Apr 9, 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 'maint-1.6.1' into maint

    gitster committed Apr 9, 2009
    * maint-1.6.1:
      process_{tree,blob}: Remove useless xstrdup calls
  5. 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
  6. Merge branch 'jc/maint-1.6.0-keep-pack' into maint

    gitster committed Apr 9, 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
    
    Conflicts:
    	t/t7700-repack.sh
  7. 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
  8. 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"
  9. 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
  10. 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
  11. process_{tree,blob}: Remove useless xstrdup calls

    dotdash authored and gitster committed 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. git-pull.sh: better warning message for "git pull" on detached head.

    moy authored and gitster committed Apr 8, 2009
    Otherwise, git complains about not finding a branch to pull from in
    'branch..merge', which is hardly understandable. While we're there,
    reword the sentences slightly.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint-1.6.1' into maint

    gitster committed Apr 8, 2009
    * maint-1.6.1:
      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
  3. Change double quotes to single quotes in message

    jaalto authored and gitster committed Mar 21, 2009
    Most of the time when we give branch name in the message, we quote it
    inside a pair of single-quotes.  git-checkout uses double-quotes; this
    patch corrects the inconsistency.
    
    Signed-off-by: Jari Aalto <jari.aalto@cante.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. 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
  5. Documentation: clarify .gitattributes search

    jicama authored and gitster committed 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>
  6. git-checkout.txt: clarify that <branch> applies when no path is given.

    moy authored and gitster committed 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>
  7. git-checkout.txt: fix incorrect statement about HEAD and index

    moy authored and gitster committed 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. git submodule: fix usage line

    jd authored and gitster committed Mar 31, 2009
    Actually, you have to set the -b option after the add command.
    
    Signed-off-by: Julien Danjou <julien@danjou.info>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint-1.6.1' into maint

    gitster committed Apr 5, 2009
    * maint-1.6.1:
      commit: abort commit if interactive add failed
      git-repack: use non-dashed update-server-info
  3. 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
  4. doc/git-pack-refs: fix two grammar issues

    marcows authored and gitster committed Apr 4, 2009
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. commit: abort commit if interactive add failed

    peff authored and gitster committed 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>
  6. git-repack: use non-dashed update-server-info

    toofishes authored and gitster committed 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. GIT 1.6.2.2

    gitster committed Apr 2, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/maint-1.6.0-blame-s' into maint

    gitster committed Apr 2, 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 'js/maint-diff-temp-smudge' into maint

    gitster committed Apr 2, 2009
    * js/maint-diff-temp-smudge:
      Smudge the files fed to external diff and textconv
  4. Merge branch 'js/maint-1.6.0-exec-path-env' into maint

    gitster committed Apr 2, 2009
    * js/maint-1.6.0-exec-path-env:
      Propagate --exec-path setting to external commands via GIT_EXEC_PATH
  5. Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint

    gitster committed Apr 2, 2009
    * bc/maint-1.6.1-branch-deleted-was:
      git-branch: display "was sha1" on branch deletion rather than just "sha1"
    
    Conflicts:
    	builtin-branch.c
  6. Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint

    gitster committed Apr 2, 2009
    * tr/maint-1.6.1-doc-format-patch--root:
      Documentation: format-patch --root clarifications