Permalink
Commits on Apr 18, 2009
  1. Update draft release notes to 1.6.3

    gitster committed Apr 18, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'lt/bool-on-off'

    gitster committed Apr 18, 2009
    * lt/bool-on-off:
      Documentation: boolean value may be given by on/off
      Allow users to un-configure rename detection
  3. Merge branch 'lt/pack-object-memuse'

    gitster committed Apr 18, 2009
    * lt/pack-object-memuse:
      show_object(): push path_name() call further down
      process_{tree,blob}: show objects without buffering
    
    Conflicts:
    	builtin-pack-objects.c
    	builtin-rev-list.c
    	list-objects.c
    	list-objects.h
    	upload-pack.c
  4. Merge branch 'nd/archive-attribute'

    gitster committed Apr 18, 2009
    * nd/archive-attribute:
      archive test: attributes
      archive: do not read .gitattributes in working directory
      unpack-trees: do not muck with attributes when we are not checking out
      attr: add GIT_ATTR_INDEX "direction"
      archive tests: do not use .gitattributes in working directory
  5. Merge branch 'maint'

    gitster committed Apr 18, 2009
    * maint:
      Describe fixes since 1.6.2.3
      doc/git-daemon: add missing arguments to max-connections option
      doc/git-daemon: add missing arguments to options
      init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
      imap-send: use correct configuration variable in documentation
  6. Describe fixes since 1.6.2.3

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

    gitster committed Apr 18, 2009
    * maint-1.6.1:
  8. 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
  9. 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
  10. 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
  11. 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
  12. doc/git-daemon: add missing arguments to max-connections option

    marcows authored and gitster committed Apr 18, 2009
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. 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
  14. doc/git-daemon: add missing arguments to options

    marcows authored and gitster committed 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>
  15. init: Do not segfault on big GIT_TEMPLATE_DIR environment variable

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

    pebolle authored and gitster committed 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>
  17. Merge branch 'ac/color-graph'

    gitster committed Apr 18, 2009
    * ac/color-graph:
      graph API: Added logic for colored edges
  18. Merge branch 'jk/cobdoc'

    gitster committed Apr 18, 2009
    * jk/cobdoc:
      docs/checkout: clarify what "non-branch" means
      doc/checkout: split checkout and branch creation in synopsis
      doc/checkout: refer to git-branch(1) as appropriate
      doc: refer to tracking configuration as "upstream"
      doc: clarify --no-track option
  19. Merge branch 'mk/apply-swap'

    gitster committed Apr 18, 2009
    * mk/apply-swap:
      builtin-apply: keep information about files to be deleted
      tests: test applying criss-cross rename patch
  20. Merge branch 'mm/add-p-quit'

    gitster committed Apr 18, 2009
    * mm/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.
  21. Merge branch 'eb/upload-archive-from-git-shell'

    gitster committed Apr 18, 2009
    * eb/upload-archive-from-git-shell:
      git-shell: Add 'git-upload-archive' to allowed commands.
  22. Merge branch 'jc/shared-literally'

    gitster committed Apr 18, 2009
    * jc/shared-literally:
      t1301-shared-repo: fix forced modes test
  23. Merge branch 'ns/am-to-empty'

    gitster committed Apr 18, 2009
    * ns/am-to-empty:
      git-am: teach git-am to apply a patch to an unborn branch
  24. Merge branch 'bw/short-ref-strict'

    gitster committed Apr 18, 2009
    * bw/short-ref-strict:
      remote.c: use shorten_unambiguous_ref
      rev-parse: --abbrev-ref option to shorten ref name
      for-each-ref: utilize core.warnAmbiguousRefs for :short-format
      shorten_unambiguous_ref(): add strict mode
  25. Merge branch 'da/difftool'

    gitster committed Apr 18, 2009
    * da/difftool:
      mergetool--lib: simplify API usage by removing more global variables
      Fix misspelled mergetool.keepBackup
      difftool/mergetool: refactor commands to use git-mergetool--lib
      mergetool: use $( ... ) instead of `backticks`
      bash completion: add git-difftool
      difftool: add support for a difftool.prompt config variable
      difftool: add various git-difftool tests
      difftool: move 'git-difftool' out of contrib
      difftool/mergetool: add diffuse as merge and diff tool
      difftool: add a -y shortcut for --no-prompt
      difftool: use perl built-ins when testing for msys
      difftool: remove the backup file feature
      difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
      git-mergetool: add new merge tool TortoiseMerge
      git-mergetool/difftool: make (g)vimdiff workable under Windows
      doc/merge-config: list ecmerge as a built-in merge tool
  26. Merge branch 'maint'

    gitster committed Apr 18, 2009
    * maint:
      doc/gitattributes: clarify location of config text
      Fix buffer overflow in config parser
      git-apply: fix option description
  27. doc/gitattributes: clarify location of config text

    peff authored and gitster committed 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>
  28. hook/update: example of how to prevent branch creation

    MadCoder authored and gitster committed Apr 16, 2009
    Since git doesn't provide a receive.denyBranchCreation or similar, here is
    an example of how to be sure users cannot create branches remotely by
    pushing a new reference.
    
    This setup has been proven useful to prevent creation of spurious branches
    because of users having their remote.origin.push set to HEAD, when they
    use `git push` while being on a local topic branch of theirs instead of
    the proper one.
    
    Signed-off-by: Pierre Habouzit <madcoder@debian.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  29. Merge branch 'maint-1.6.1' into maint

    gitster committed Apr 18, 2009
    * maint-1.6.1:
      Fix buffer overflow in config parser
  30. 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
  31. archive test: attributes

    René Scharfe authored and gitster committed Apr 17, 2009
    Add a test script for all archive attributes and their handling in
    normal and bare repositories.  export-ignore and export-subst are
    tested, as well as the effect of the option --worktree-attributes.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  32. archive: do not read .gitattributes in working directory

    pclouds authored and gitster committed Apr 17, 2009
    The old behaviour still remains with --worktree-attributes, and it is
    always on for the legacy "git tar-tree".
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  33. unpack-trees: do not muck with attributes when we are not checking out

    gitster committed Apr 17, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  34. attr: add GIT_ATTR_INDEX "direction"

    pclouds authored and gitster committed Apr 17, 2009
    This instructs attr mechanism, not to look into working .gitattributes
    at all. Needed by tools that does not handle working directory, such
    as "git archive".
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  35. archive tests: do not use .gitattributes in working directory

    René Scharfe authored and gitster committed Apr 17, 2009
    We are interested in using archive mostly from a bare repository, so it
    should not add .gitattributes to the work tree.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>