Skip to content
Commits on Apr 12, 2009
  1. @gitster

    GIT 1.6.2.3

    gitster committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'maint-1.6.1' into maint

    gitster committed
    * maint-1.6.1:
      State the effect of filter-branch on graft explicitly
      process_{tree,blob}: Remove useless xstrdup calls
  3. @gitster

    Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed
    * maint-1.6.0:
      State the effect of filter-branch on graft explicitly
      process_{tree,blob}: Remove useless xstrdup calls
  4. @j16sdiz @gitster

    State the effect of filter-branch on graft explicitly

    j16sdiz committed with gitster
    Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @torvalds @gitster

    process_{tree,blob}: Remove useless xstrdup calls

    torvalds committed with gitster
    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. @gitster

    Start 1.6.2.3 preparation

    gitster committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'jc/shared-literally' into maint

    gitster committed
    * 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. @gitster

    Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint

    gitster committed
    * 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. @gitster

    Merge branch 'maint-1.6.1' into maint

    gitster committed
    * maint-1.6.1:
      process_{tree,blob}: Remove useless xstrdup calls
  5. @gitster

    Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed
    * maint-1.6.0:
      process_{tree,blob}: Remove useless xstrdup calls
  6. @gitster

    Merge branch 'jc/maint-1.6.0-keep-pack' into maint

    gitster committed
    * 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. @gitster

    Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1

    gitster committed
    * jc/maint-1.6.0-blame-s:
      blame: read custom grafts given by -S before calling setup_revisions()
    
    Conflicts:
    	builtin-blame.c
  8. @gitster

    Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1

    gitster committed
    * bc/maint-1.6.1-branch-deleted-was:
      git-branch: display "was sha1" on branch deletion rather than just "sha1"
  9. @gitster

    Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1

    gitster committed
    * js/maint-1.6.0-exec-path-env:
      Propagate --exec-path setting to external commands via GIT_EXEC_PATH
  10. @gitster

    Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1

    gitster committed
    * tr/maint-1.6.1-doc-format-patch--root:
      Documentation: format-patch --root clarifications
  11. @dotdash @gitster

    process_{tree,blob}: Remove useless xstrdup calls

    dotdash committed with gitster
    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. @moy @gitster

    git-pull.sh: better warning message for "git pull" on detached head.

    moy committed with gitster
    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. @gitster

    Merge branch 'maint-1.6.1' into maint

    gitster committed
    * 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. @jaalto @gitster

    Change double quotes to single quotes in message

    jaalto committed with gitster
    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. @gitster

    Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed
    * 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. @jicama @gitster

    Documentation: clarify .gitattributes search

    jicama committed with gitster
    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. @moy @gitster

    git-checkout.txt: clarify that <branch> applies when no path is given.

    moy committed with gitster
    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. @moy @gitster

    git-checkout.txt: fix incorrect statement about HEAD and index

    moy committed with gitster
    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. @jd @gitster

    git submodule: fix usage line

    jd committed with gitster
    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. @gitster

    Merge branch 'maint-1.6.1' into maint

    gitster committed
    * maint-1.6.1:
      commit: abort commit if interactive add failed
      git-repack: use non-dashed update-server-info
  3. @gitster

    Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed
    * maint-1.6.0:
      commit: abort commit if interactive add failed
      git-repack: use non-dashed update-server-info
    
    Conflicts:
    	builtin-commit.c
  4. @marcows @gitster

    doc/git-pack-refs: fix two grammar issues

    marcows committed with gitster
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @peff @gitster

    commit: abort commit if interactive add failed

    peff committed with gitster
    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. @toofishes @gitster

    git-repack: use non-dashed update-server-info

    toofishes committed with gitster
    Signed-off-by: Dan McGee <dpmcgee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 2, 2009
  1. @gitster

    GIT 1.6.2.2

    gitster committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'jc/maint-1.6.0-blame-s' into maint

    gitster committed
    * jc/maint-1.6.0-blame-s:
      blame: read custom grafts given by -S before calling setup_revisions()
    
    Conflicts:
    	builtin-blame.c
  3. @gitster

    Merge branch 'js/maint-diff-temp-smudge' into maint

    gitster committed
    * js/maint-diff-temp-smudge:
      Smudge the files fed to external diff and textconv
  4. @gitster

    Merge branch 'js/maint-1.6.0-exec-path-env' into maint

    gitster committed
    * js/maint-1.6.0-exec-path-env:
      Propagate --exec-path setting to external commands via GIT_EXEC_PATH
  5. @gitster

    Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint

    gitster committed
    * 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. @gitster

    Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint

    gitster committed
    * tr/maint-1.6.1-doc-format-patch--root:
      Documentation: format-patch --root clarifications
Something went wrong with that request. Please try again.