From: Junio C Hamano <junkio@cox.net>
Date: Sun, 27 May 2007 01:53:22 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc0~195
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c56ed464b0ba275d9f2e3598c61b391e98fc217b?ds=inline;hp=-c

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
---

c56ed464b0ba275d9f2e3598c61b391e98fc217b
diff --combined diff.c
index 0e260490d7,af282ddd88..508bc51ed5
--- a/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 351676f6d4,b2f8a2acd3..ff92aaf3f9
--- a/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