Merge branch 'fc/remote-testgit-feature-done' into pu

In the longer term, tightening rules is a good thing to do, and
because nobody who has worked in the remote helper area seems to be
interested in reviewing this, I would assume they do not think
such a retroactive tightening will affect their remote helpers.  So
let's advance this topic to see what happens.

Will merge to 'next'.

* fc/remote-testgit-feature-done:
  remote-testgit: properly check for errors
Merge branch 'jc/doc-maintainer' into pu

Describe tools for automation that were invented since this
document was originally written.

Will merge to 'next'.

* jc/doc-maintainer:
  howto/maintain: mark titles for asciidoc
  Documentation: update "howto maintain git"
Merge branch 'jc/push-2.0-default-to-simple' into pu

Will merge to 'next' and cook there until Git 2.0.

* jc/push-2.0-default-to-simple:
  doc: push.default is no longer "matching"
  push: switch default from "matching" to "simple"
  t9401: do not assume the "matching" push is the default
  t9400: do not assume the "matching" push is the default
  t7406: do not assume the "matching" push is the default
  t5531: do not assume the "matching" push is the default
  t5519: do not assume the "matching" push is the default
  t5517: do not assume the "matching" push is the default
  t5516: do not assume the "matching" push is the default
  t5505: do not assume the "matching" push is the default
  t5404: do not assume the "matching" push is the default

Conflicts:
	builtin/push.c
Merge branch 'mk/complete-tcsh' into pu

Update tcsh command line completion so that an unwanted space is
not added to a single directory name.

Will merge to 'next'.

* mk/complete-tcsh:
  Prevent space after directories in tcsh completion
Merge branch 'ap/log-mailmap' into pu

Need to rename this back to ap/log-mailmap before moving it forward.

* ap/log-mailmap:
  log --use-mailmap: optimize for cases without --author/--committer search
  log: add log.mailmap configuration option
  log: grep author/committer using mailmap
  test: add test for --use-mailmap option
  log: add --use-mailmap option
  pretty: use mailmap to display username and email
  mailmap: add mailmap structure to rev_info and pp
  mailmap: simplify map_user() interface
  mailmap: remove email copy and length limitation
  Use split_ident_line to parse author and committer
  string-list: allow case-insensitive string list

Conflicts:
	commit.h
	log-tree.c
	mailmap.c
Merge branch 'dg/subtree-fixes' into pu

contrib/subtree updates.

Will merge to 'next'.

* dg/subtree-fixes:
  contrib/subtree: mkdir the manual directory if needed
  contrib/subtree: honor $(DESTDIR)
  contrib/subtree: fix synopsis and command help
  contrib/subtree: better error handling for "add"
  contrib/subtree: add --unannotate option
  contrib/subtree: use %B for split Subject/Body
  t7900: remove test number comments
Merge branch 'nd/upload-pack-shallow-must-be-commit' into pu

A minor consistency check patch that does not have much relevance
to the real world.

Will merge to 'next'.

* nd/upload-pack-shallow-must-be-commit:
  upload-pack: only accept commits from "shallow" line
### May be rerolled
Merge branch 'zk/clean-report-failure' into pu

"git clean" states what it is going to remove and then goes on to
remove it, but sometimes it only discovers things that cannot be
removed after recursing into a directory, which makes the output
confusing and even wrong.

Rerolled.

* zk/clean-report-failure:
  git-clean: Display more accurate delete messages
### Iffy
Merge branch 'ap/status-ignored-in-ignored-directory' into pu

Originally merged to 'next' on 2013-01-04

Output from "git status --ignored" showed an unexpected interaction
with "--untracked".

Will merge to 'next'.

* ap/status-ignored-in-ignored-directory:
  status: always report ignored tracked directories
Merge branch 'as/check-ignore' into pu

Rerolled.

* as/check-ignore:
  add git-check-ignore sub-command
  setup.c: document get_pathspec()
  add.c: extract new die_if_path_beyond_symlink() for reuse
  add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse
  pathspec.c: rename newly public functions for clarity
  add.c: move pathspec matchers into new pathspec.c for reuse
  add.c: remove unused argument from validate_pathspec()
  dir.c: improve docs for match_pathspec() and match_pathspec_depth()
  dir.c: provide clear_directory() for reclaiming dir_struct memory
  dir.c: keep track of where patterns came from
  dir.c: use a single struct exclude_list per source of excludes

Conflicts:
	builtin/ls-files.c
	dir.c
### Expecting a reroll
Merge branch 'mb/remote-default-nn-origin' into pu

When the user does not specify what remote to interact with, we
often attempt to use 'origin'.  This can now be customized via a
configuration variable.

Expecting a reroll.
$gmane/210151

"The first remote becomes the default" bit is better done as a
separate step.

* mb/remote-default-nn-origin:
  Teach get_default_remote to respect remote.default.
  Test that plain "git fetch" uses remote.default when on a detached HEAD.
  Teach clone to set remote.default.
  Teach "git remote" about remote.default.
  Teach remote.c about the remote.default configuration setting.
  Rename remote.c's default_remote_name static variables.

Conflicts:
	builtin/remote.c
	t/t5505-remote.sh
Merge branch 'mb/gitweb-highlight-link-target' into pu

Expecting a reroll.
$gmane/211935

* mb/gitweb-highlight-link-target:
  Highlight the link target line in Gitweb using CSS
Merge branch 'bc/append-signed-off-by' into pu

Expecting a reroll.
$gmane/212507

* bc/append-signed-off-by:
  t4014: do not use echo -n
  Unify appending signoff in format-patch, commit and sequencer
  format-patch: update append_signoff prototype
  format-patch: stricter S-o-b detection
  t4014: more tests about appending s-o-b lines
  sequencer.c: teach append_signoff to avoid adding a duplicate newline
  sequencer.c: teach append_signoff how to detect duplicate s-o-b
  sequencer.c: always separate "(cherry picked from" from commit body
  sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer
  t/t3511: add some tests of 'cherry-pick -s' functionality
  t/test-lib-functions.sh: allow to specify the tag name to test_commit
  sequencer.c: remove broken support for rfc2822 continuation in footer

Conflicts:
	builtin/log.c
	t/t4014-format-patch.sh
Merge branch 'nd/clone-no-separate-git-dir-with-bare' into pu

Expecting a reroll.
$gmane/212863

* nd/clone-no-separate-git-dir-with-bare:
  clone: forbid --bare --separate-git-dir <dir>
Merge branch 'nd/parse-pathspec' into pu

Uses the parsed pathspec structure in more places where we used to
use the raw "array of strings" pathspec.

Unfortunately, this conflicts a couple of topics in flight. I tried
to be careful while resolving conflicts, though.

* nd/parse-pathspec: (21 commits)
  Convert more init_pathspec() to parse_pathspec()
  Convert add_files_to_cache to take struct pathspec
  Convert {read,fill}_directory to take struct pathspec
  Convert refresh_index to take struct pathspec
  Convert report_path_error to take struct pathspec
  checkout: convert read_tree_some to take struct pathspec
  Convert unmerge_cache to take struct pathspec
  Convert read_cache_preload() to take struct pathspec
  add: convert to use parse_pathspec
  archive: convert to use parse_pathspec
  ls-files: convert to use parse_pathspec
  rm: convert to use parse_pathspec
  checkout: convert to use parse_pathspec
  rerere: convert to use parse_pathspec
  status: convert to use parse_pathspec
  commit: convert to use parse_pathspec
  clean: convert to use parse_pathspec
  Export parse_pathspec() and convert some get_pathspec() calls
  pathspec: make sure the prefix part is wildcard-clean
  Add parse_pathspec() that converts cmdline args to struct pathspec
  ...

Conflicts:
	builtin/add.c
	builtin/ls-files.c
	cache.h
	dir.c
	setup.c
	tree-walk.c
	wt-status.c
Merge branch 'mp/complete-paths' into pu

The completion script used to let the default completer to suggest
pathnames, which gave too many irrelevant choices (e.g. "git add"
would not want to add an unmodified path).  Teach it to use a more
git-aware logic to enumerate only relevant ones.

It has been reported (no surprise) that this does not work inside
subdirectory, and fixing it seems to be non-trivial. $gmane/212642

Waiting for area-experts' help.

* mp/complete-paths:
  git-completion.bash: add support for path completion

Conflicts:
	contrib/completion/git-completion.bash
### Stalled