git/whats/in/2009/04/02.txt

To: git@vger.kernel.org
Subject: What's in git.git (Apr 2009, #02; Wed, 29)
X-maint-at: a2dc04ba159def766ee17db00c60bdbda477955d
X-master-at: 6ffd567bec439e7809ee0966556bd5e72fb78de4
X-maint-was: 3bd1bb327eb4d3e386800897734f9f42b48280ff
X-master-was: c965c029330b1f81cc107c5d829e7fd79c61d8ea

What's in git.git (Apr 2009, #02; Wed, 29)

  maint a2dc04b (Merge branch 'maint-1.6.1' into maint)
 master 6ffd567 (improve error message in config.c)
------------------------------------------------------------------------

It's been a while since I sent the "What's in" report.  Hopefully we can
do an -rc4 this weekend and then 1.6.3 final next week.

* The 'maint' branch has these fixes since 1.6.2.3

Allan Caffee (2):
  builtin-merge: fix a typo in an error message
  Documentation: fix a grammatical error in api-builtin.txt

Björn Steinbrink (1):
  tree_entry_interesting: a pathspec only matches at directory boundary

Clemens Buchacher (3):
  add tests for merging with submodules
  update cache for conflicting submodule entries
  simplify output of conflicting merge

Erik Faye-Lund (4):
  test-suite: adding a test for fast-export with tag variants
  builtin-fast-export.c: turn error into warning
  builtin-fast-export.c: fix crash on tagged trees
  builtin-fast-export.c: handle nested tags

Frank Lichtenheld (2):
  init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
  gitcvs-migration: Link to git-cvsimport documentation

Jeff King (2):
  doc/gitattributes: clarify location of config text
  add-interactive: refactor mode hunk handling

Johan Herland (1):
  Update docs on behaviour of 'core.sharedRepository' and 'git init
    --shared'

Johannes Schindelin (2):
  Fix 'git checkout <submodule>' to update the index
  Fix off-by-one in read_tree_recursive

Johannes Sixt (1):
  t1301-shared-repo: fix forced modes test

Junio C Hamano (4):
  match_tree_entry(): a pathspec only matches at directory boundaries
  Describe fixes since 1.6.2.3
  GIT 1.6.2.4
  diff -c -p: do not die on submodules

Junio Hamano (1):
  Speed up reflog pruning of unreachable commits

Linus Torvalds (2):
  Clean up reflog unreachability pruning decision
  grep: fix segfault when "git grep '('" is given

Markus Heidelberg (2):
  doc/git-daemon: add missing arguments to options
  doc/git-daemon: add missing arguments to max-connections option

Matthieu Moy (2):
  git add -p: new "quit" command at the prompt.
  Update git-add.txt according to the new possibilities of 'git add -p'.

Nguyễn Thái Ngọc Duy (1):
  Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins

Paul Bolle (1):
  imap-send: use correct configuration variable in documentation

Stephen Boyd (1):
  test-genrandom: Add newline to usage string

Thomas Jarosch (1):
  Fix buffer overflow in config parser

Ulrich Windl (1):
  git-apply: fix option description


* The 'master' branch has these since 1.6.3-rc0
  in addition to the above.

Alex Riesen (3):
  Wait for git diff to finish in git difftool
  Explain seemingly pointless use of system in difftool
  improve error message in config.c

Allan Caffee (4):
  graph API: Added logic for colored edges
  t4202-log: extend test coverage of graphing
  graph API: fix extra space during pre_commit_line state
  graph API: fix a bug in the rendering of octopus merges

Ben Jackson (1):
  Work around ash "alternate value" expansion bug

Benjamin Kramer (2):
  connect: replace inet_ntop with getnameinfo
  daemon.c: fix segfault on OS X

Bert Wesarg (3):
  shorten_unambiguous_ref(): add strict mode
  for-each-ref: utilize core.warnAmbiguousRefs for :short-format
  rev-parse: --abbrev-ref option to shorten ref name

Bill Pemberton (1):
  Add parsing of elm aliases to git-send-email

Brandon Casey (2):
  t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
  t7700-repack: repack -a now works properly, expect success from test

Dan Loewenherz (1):
  Convert to use quiet option when available

David Aguilar (11):
  difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
  difftool: remove the backup file feature
  difftool: use perl built-ins when testing for msys
  difftool: add a -y shortcut for --no-prompt
  difftool: move 'git-difftool' out of contrib
  difftool: add various git-difftool tests
  difftool: add support for a difftool.prompt config variable
  bash completion: add git-difftool
  mergetool: use $( ... ) instead of `backticks`
  difftool/mergetool: refactor commands to use git-mergetool--lib
  mergetool--lib: simplify API usage by removing more global variables

Eric Blake (2):
  Makefile: installing git in cygwin 1.7.0
  doc: consistently use ASCIIDOC_EXTRA

Erik Broes (1):
  git-shell: Add 'git-upload-archive' to allowed commands.

Felipe Contreras (1):
  git config: error when editing a repo config and not being in one

Ferry Huberts (1):
  Fix misspelled mergetool.keepBackup

Holger Weiß (1):
  gitweb: Fix snapshots requested via PATH_INFO

Jeff King (8):
  doc: clarify --no-track option
  doc: refer to tracking configuration as "upstream"
  doc/checkout: refer to git-branch(1) as appropriate
  doc/checkout: split checkout and branch creation in synopsis
  docs/checkout: clarify what "non-branch" means
  add-interactive: refactor mode hunk handling
  t7800: respect NO_PERL
  Makefile: fix NO_PERL bug with gitweb

Johannes Schindelin (3):
  Add an option not to use link(src, dest) && unlink(src) when that is
    unreliable
  t5701: do not get stuck in empty-push/
  Rename core.unreliableHardlinks to core.createObject

Johannes Sixt (5):
  Windows: Work around intermittent failures in mingw_rename
  Windows: Skip fstat/lstat optimization in write_entry()
  builtin-help: silently tolerate unknown keys
  remote.c: do not trigger remote.<name>.<var> codepath for two-level names
  prune-packed: advanced progress even for non-existing fan-out directories

Junio C Hamano (11):
  gitignore git-bisect--helper
  unpack-trees: do not muck with attributes when we are not checking out
  Update draft release notes to 1.6.3
  read-tree A B: do not corrupt cache-tree
  Move prime_cache_tree() to cache-tree.c
  read-tree -m A B: prime cache-tree from the switched-to tree
  checkout branch: prime cache-tree fully
  Revert "stat_tracking_info(): only count real commits"
  Makefile: ignore perl/ subdirectory under NO_PERL
  GIT 1.6.3-rc2
  merge-recursive: do not die on a conflicting submodule

Linus Torvalds (4):
  Allow users to un-configure rename detection
  process_{tree,blob}: show objects without buffering
  show_object(): push path_name() call further down
  t4202: fix typo

Mark Drago (1):
  Add semicolon to curly brace group in main Makefile

Markus Heidelberg (4):
  doc/merge-config: list ecmerge as a built-in merge tool
  git-mergetool/difftool: make (g)vimdiff workable under Windows
  git-mergetool: add new merge tool TortoiseMerge
  grep: don't support "grep.color"-like config options

Matthieu Moy (3):
  git add -p: new "quit" command at the prompt.
  Update git-add.txt according to the new possibilities of 'git add -p'.
  clone: add test for push on an empty clone.

Michael J Gruber (3):
  remote.c: use shorten_unambiguous_ref
  test-lib.sh: Help test_create_repo() find the templates dir
  Fix more typos/spelling in comments

Michał Kiedrowicz (6):
  tests: test applying criss-cross rename patch
  builtin-apply: keep information about files to be deleted
  Documentation: boolean value may be given by on/off
  tests: test applying criss-cross rename patch
  builtin-apply: keep information about files to be deleted
  tests: make test-apply-criss-cross-rename more robust

Mike Ralphson (3):
  builtin-remote: fix typo in option description
  Documentation: fix typos / spelling mistakes
  Fix typos / spelling in comments

Nanako Shiraishi (1):
  git-am: teach git-am to apply a patch to an unborn branch

Nguyễn Thái Ngọc Duy (3):
  get_local_heads(): do not return random pointer if there is no head
  attr: add GIT_ATTR_INDEX "direction"
  archive: do not read .gitattributes in working directory

Nicolas Pitre (1):
  progress bar: round to the nearest instead of truncating down

Patrick Welche (1):
  NetBSD compilation fix

Pierre Habouzit (1):
  hook/update: example of how to prevent branch creation

René Scharfe (2):
  archive tests: do not use .gitattributes in working directory
  archive test: attributes

Sam Vilain (1):
  SubmittingPatches: itemize and reflect upon well written changes

Sebastian Pipping (1):
  difftool/mergetool: add diffuse as merge and diff tool

Sitaram Chamarty (1):
  Remove obsolete bug warning in man git-update-server-info

Stephen Boyd (7):
  config.txt: add missing format.{subjectprefix,cc,attach} variables
  Documentation: use lowercase for shallow and deep threading
  git-show-branch.txt: cleanup example description
  git-format-patch.txt: general rewordings and cleanups
  config.txt: add missing 'the's and make words plural
  config.txt: clarify sentences in the configuration and syntax sections
  config.txt: Make configuration paragraph more consistent

Uwe Kleine-König (1):
  parseopt: fix documentation for --keep-dashdash

Wesley J. Landaker (4):
  Documentation: git-svn: fix spurious bolding that mangles the output
  Documentation: git-svn: fix a grammatical error without awkwardness
  Documentation: git-clean: fix minor grammatical errors
  Documentation: git-clean: make description more readable

Wincent Colaiuta (1):
  git add -p: add missing "q" to patch prompt