Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 13, 2009
  1. @gitster

    GIT 1.6.3-rc0

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

    Documentation/git.txt: GIT 1.6.2.2 has been out for a while

    Nanako Shiraishi authored gitster committed
    These links inside "stalenotes" section need to be updated on the master
    branch every time a new stable or maintenance release is made.
    
    Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 12, 2009
  1. @gitster

    Merge branch 'jk/no-perl'

    gitster authored
    * jk/no-perl:
      tests: skip perl tests if NO_PERL is defined
      Makefile: allow building without perl
  2. @gitster

    Merge branch 'sb/doc-upstream-branch'

    gitster authored
    * sb/doc-upstream-branch:
      Documentation: Introduce "upstream branch"
  3. @gitster

    Merge branch 'jk/show-upstream'

    gitster authored
    * jk/show-upstream:
      branch: show upstream branch when double verbose
      make get_short_ref a public function
      for-each-ref: add "upstream" format field
      for-each-ref: refactor refname handling
      for-each-ref: refactor get_short_ref function
  4. @gitster

    Merge branch 'fg/remote-prune'

    gitster authored
    * fg/remote-prune:
      add tests for remote groups
      git remote update: Fallback to remote if group does not exist
      remote: New function remote_is_configured()
      git remote update: Report error for non-existing groups
      git remote update: New option --prune
      builtin-remote.c: Split out prune_remote as a separate function.
  5. @gitster

    Merge branch 'cc/sha1-bsearch'

    gitster authored
    * cc/sha1-bsearch:
      sha1-lookup: fix up the assertion message
  6. @gitster

    Merge branch 'cc/bisect-filter'

    gitster authored
    * cc/bisect-filter: (21 commits)
      rev-list: add "int bisect_show_flags" in "struct rev_list_info"
      rev-list: remove last static vars used in "show_commit"
      list-objects: add "void *data" parameter to show functions
      bisect--helper: string output variables together with "&&"
      rev-list: pass "int flags" as last argument of "show_bisect_vars"
      t6030: test bisecting with paths
      bisect: use "bisect--helper" and remove "filter_skipped" function
      bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES"
      bisect--helper: implement "git bisect--helper"
      bisect: use the new generic "sha1_pos" function to lookup sha1
      rev-list: call new "filter_skip" function
      patch-ids: use the new generic "sha1_pos" function to lookup sha1
      sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1
      rev-list: pass "revs" to "show_bisect_vars"
      rev-list: make "show_bisect_vars" non static
      rev-list: move code to show bisect vars into its own function
      rev-list: move bisect related code into its own file
      rev-list: make "bisect_list" variable local to "cmd_rev_list"
      refs: add "for_each_ref_in" function to refactor "for_each_*_ref" functions
      quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array
      ...
  7. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      GIT 1.6.2.3
      State the effect of filter-branch on graft explicitly
      process_{tree,blob}: Remove useless xstrdup calls
    
    Conflicts:
    	GIT-VERSION-GEN
  8. @gitster

    GIT 1.6.2.3

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @gitster

    Merge branch 'maint-1.6.1' into maint

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

    Merge branch 'maint-1.6.0' into maint-1.6.1

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

    State the effect of filter-branch on graft explicitly

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

    process_{tree,blob}: Remove useless xstrdup calls

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

    documentation: Makefile accounts for SHELL_PATH setting

    Ben Walton authored gitster committed
    Ensure that the Makefile that generates and installs the Documentation is
    aware of any SHELL_PATH setting.  Use this value if found or the current
    setting for SHELL if not.  This is an accommodation for systems where sh
    is not POSIX enough.
    
    Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. @torvalds @gitster

    Allow users to un-configure rename detection

    torvalds authored gitster committed
    I told people on the kernel mailing list to please use "-M" when sending
    me rename patches, so that I can see what they do while reading email
    rather than having to apply the patch and then look at the end result.
    
    I also told them that if they want to make it the default, they can just
    add
    
    	[diff]
    		renames
    
    to their ~/.gitconfig file. And while I was thinking about that, I wanted
    to also check whether you can then mark individual projects to _not_ have
    that default in the per-repository .git/config file.
    
    And you can't. Currently you cannot have a global "enable renames by
    default" and then a local ".. but not for _this_ project". Why? Because if
    somebody writes
    
    	[diff]
    		renames = no
    
    we simply ignore it, rather than resetting "diff_detect_rename_default"
    back to zero.
    
    Fixed thusly.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. @glandium @gitster

    Replace ",<,>,& with their respective XML entities in DAV requests

    glandium authored gitster committed
    If the repo url or the user email contain XML special characters, the
    remote DAV server is likely to reject the LOCK requests because the XML
    is then malformed.
    
    Signed-off-by: Mike Hommey <mh@glandium.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  16. @dscho @gitster

    git-svn: always initialize with core.autocrlf=false

    dscho authored gitster committed
    It has been reported time and time again in relation to msysGit that
    git-svn does not work well when core.autocrlf has any value other than
    'false'.  So let's make it so by default.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  17. @toofishes @gitster

    Update delta compression message to be less misleading

    toofishes authored gitster committed
    In the case of a small repository, pack-objects is smart enough to not
    start more threads than necessary. However, the output to the user always
    reports the value of the pack.threads configuration and not the real
    number of threads to be used.
    
    Signed-off-by: Dan McGee <dpmcgee@gmail.com>
    Acked-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  18. @bjj

    git-svn: Save init/clone --ignore-paths in config

    bjj authored Eric Wong committed
    The --ignored-paths argument is now stored as
    "svn-remote.$REMOTE_NAME.ignore-paths" in the config file.
    
    [ew: edited subject and message]
    Signed-off-by: Ben Jackson <ben@ben.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  19. @bjj

    git-svn: Add per-svn-remote ignore-paths config

    bjj authored Eric Wong committed
    The --ignore-paths option to fetch is very useful for working on a subset
    of a SVN repository.  For proper operation, every command that causes a
    fetch (explicit or implied) must include a matching --ignore-paths option.
    
    This patch adds a persistent svn-remote.$repo_id.ignore-paths config by
    promoting Fetcher::is_path_ignored to a member function and initializing
    $self->{ignore_regex} in Fetcher::new.  Command line --ignore-paths is
    still recognized and acts in addition to the config value.
    
    Signed-off-by: Ben Jackson <ben@ben.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  20. @bbyk

    git-svn: speed up blame command

    bbyk authored Eric Wong committed
    'git svn blame' now uses the 'git cat-file --batch' command to
    speed up resolving SVN revision number out of commit SHA by
    removing fork+exec overhead.
    
    [ew: enforced 80-column line wrap]
    
    Signed-off-by: Boris Byk <boris.byk@gmail.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
  21. @jicama

    git-svn: add fetch --parent option

    jicama authored Eric Wong committed
    Signed-off-by: Jason Merrill <jason@redhat.com>
    Acked-By: Eric Wong <normalperson@yhbt.net>
Commits on Apr 9, 2009
  1. @peff @gitster

    add tests for remote groups

    peff authored gitster committed
    This tries to systematically cover existing behavior, and
    also mark some expect_failure cases for desired behavior.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Update draft release notes to 1.6.3

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Start 1.6.2.3 preparation
      process_{tree,blob}: Remove useless xstrdup calls
      git-pull.sh: better warning message for "git pull" on detached head.
    
    Conflicts:
    	RelNotes
  4. @gitster

    Start 1.6.2.3 preparation

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Merge branch 'jc/shared-literally' into maint

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

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

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

    Merge branch 'maint-1.6.1' into maint

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

    Merge branch 'maint-1.6.0' into maint-1.6.1

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

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

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

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

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

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

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

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

    gitster authored
    * js/maint-1.6.0-exec-path-env:
      Propagate --exec-path setting to external commands via GIT_EXEC_PATH
Something went wrong with that request. Please try again.