Merge branch 'maint'

* maint:
Fix git-svn to handle svn not reporting the md5sum of a file, and test.
Fix mishandling of $Id$ expanded in the repository copy in convert.c
More echo "$user_message" fixes.
Add tests for the last two fixes.
git-commit: use printf '%s\n' instead of echo on user-supplied strings
git-am: use printf instead of echo on user-supplied strings
Documentation: Add definition of "evil merge" to GIT Glossary
Replace the last 'dircache's by 'index'
Documentation: Clean up links in GIT Glossary

diff --combined diff.c
index 0e260490d7fd74aa9761f286f1ad671a6ea39841,af282ddd8818aacdc516ff6f9dff4d84097cbab0..508bc51ed59998be463fd429ee074654baaad76a
--- 1/diff.c
--- 2/diff.c
+++ b/diff.c
@@@ -1349,7 -1349,7 +1349,7 @@@ void fill_filespec(struct diff_filespe
  }
  
  /*
-  * Given a name and sha1 pair, if the dircache tells us the file in
+  * Given a name and sha1 pair, if the index tells us the file in
   * the work tree has that object contents, return true, so that
   * prepare_temp_file() does not have to inflate and extract.
   */
@@@ -1465,7 -1465,7 +1465,7 @@@ int diff_populate_filespec(struct diff_
        if (size_only && 0 < s->size)
                return 0;
  
 -      if (S_ISDIRLNK(s->mode))
 +      if (S_ISGITLINK(s->mode))
                return diff_populate_gitlink(s, size_only);
  
        if (!s->sha1_valid ||

diff --combined git-merge.sh
index 351676f6d4a39c1ac682296781f4f5c8d1a3053d,b2f8a2acd398b7c61b68a59c6d3631ca84be0727..ff92aaf3f9826a7c307154657166cd38ad2b6154
--- 1/git-merge.sh
--- 2/git-merge.sh
+++ b/git-merge.sh
@@@ -90,8 -90,7 +90,8 @@@ finish () 
        ?*)
                case "$no_summary" in
                '')
 -                      git-diff-tree --stat --summary -M "$head" "$1"
 +                      # We want color (if set), but no pager
 +                      GIT_PAGER='' git-diff --stat --summary -M "$head" "$1"
                        ;;
                esac
                ;;
@@@ -329,7 -328,7 +329,7 @@@ f,*
                then
                        echo "Wonderful."
                        result_commit=$(
-                               echo "$merge_msg" |
+                               printf '%s\n' "$merge_msg" |
                                git-commit-tree $result_tree -p HEAD -p "$1"
                        ) || exit
                        finish "$result_commit" "In-index merge"
@@@ -434,7 -433,7 +434,7 @@@ don
  if test '' != "$result_tree"
  then
      parents=$(git-show-branch --independent "$head" "$@" | sed -e 's/^/-p /')
-     result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents) || exit
+     result_commit=$(printf '%s\n' "$merge_msg" | git-commit-tree $result_tree $parents) || exit
      finish "$result_commit" "Merge made by $wt_strategy."
      dropsave
      exit 0
@@@ -473,7 -472,7 +473,7 @@@ els
        do
                echo $remote
        done >"$GIT_DIR/MERGE_HEAD"
-       echo "$merge_msg" >"$GIT_DIR/MERGE_MSG"
+       printf '%s\n' "$merge_msg" >"$GIT_DIR/MERGE_MSG"
  fi
  
  if test "$merge_was_ok" = t