[PATCH 0/4] ident attribute related patches (resend w/ testsuite)

["Henrik Grubbström (Grubba)" <grubba@grubba.org>]

These are some patches that are needed to get the support for the
'ident' attribute to a useable state.

Since last time, some issues that caused the the existing testsuite to
fail have been fixed, and the testsuite has been extended to test the
issues fixed by the patches.

Henrik Grubbström (Grubba) (4):
  convert: Safer handling of $Id$ contraction.
  convert: Keep foreign $Id$ on checkout.
  convert: Inhibit contraction of foreign $Id$ during stats.
  convert: Added core.refilteronadd feature.

 Documentation/config.txt |    6 ++++
 builtin/apply.c          |    2 +-
 builtin/blame.c          |    2 +-
 cache.h                  |    9 +++++-
 combine-diff.c           |    2 +-
 config.c                 |    5 +++
 convert.c                |   53 ++++++++++++++++++++++++++++++----
 diff.c                   |    2 +-
 environment.c            |    1 +
 sha1_file.c              |   60 +++++++++++++++++++++++++++++++++++++-
 t/t0021-conversion.sh    |   72 ++++++++++++++++++++++++++++++++++++++++++----
 11 files changed, 196 insertions(+), 18 deletions(-)