Merge branch 'master' into sp/mmap

* master:
  Documentation/config.txt (and repo-config manpage): mark-up fix.
  Teach Git how to parse standard power of 2 suffixes.
  Use /dev/null for update hook stdin.
  Redirect update hook stdout to stderr.
  Remove unnecessary argc parameter from run_command_v.
  Automatically detect a bare git repository.
  Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT.
  Use PATH_MAX constant for --bare.
  Force core.filemode to false on Cygwin.
  Fix formatting for urls section of fetch, pull, and push manpages
  Fix yet another subtle xdl_merge() bug
  i18n: drop "encoding" header in the output after re-coding.
  commit-tree: cope with different ways "utf-8" can be spelled.
  Move commit reencoding parameter parsing to revision.c
  Documentation: minor rewording for git-log and git-show pages.
  Documentation: i18n commit log message notes.
  t3900: test log --encoding=none
  commit re-encoding: fix confusion between no and default conversion.

2 files changed, 18 insertions, 1 deletions

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index e48a4ecdc..a29caa06d 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -391,5 +391,15 @@ EOF
 
 test_expect_success "rename succeeded" "diff -u expect .git/config"
 
+test_expect_success numbers '
+
+	git-repo-config kilo.gram 1k &&
+	git-repo-config mega.ton 1m &&
+	k=$(git-repo-config --int --get kilo.gram) &&
+	test z1024 = "z$k" &&
+	m=$(git-repo-config --int --get mega.ton) &&
+	test z1048576 = "z$m"
+'
+
 test_done
 
diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index 46fd47cb0..6714b0dd6 100755
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -8,7 +8,7 @@ test_description='commit and log output encodings'
 . ./test-lib.sh
 
 compare_with () {
-	git-show -s "$1" | sed -e '1,/^$/d' -e 's/^    //' -e '$d' >current &&
+	git-show -s $1 | sed -e '1,/^$/d' -e 's/^    //' -e '$d' >current &&
 	diff -u current "$2"
 }
 
@@ -112,4 +112,11 @@ do
 	done
 done
 
+for H in ISO-8859-1 EUCJP ISO-2022-JP
+do
+	test_expect_success "No conversion with $H" '
+		compare_with "--encoding=none '$H'" ../t3900/'$H'.txt
+	'
+done
+
 test_done