diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-04 03:08:23 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-04 03:08:23 +0400 |
| commit | 9b8ae93ad92efef59649a3a7c4bed162d2051059 (patch) | |
| tree | 0661cd870dec63e098efef7e1fb7db31505dbbb2 /t/t3900-i18n-commit.sh | |
| parent | 01914577ed42498d9e268684949d699e0272e964 (diff) | |
| parent | de5d560c99c96e2955fb4d1d8a8fa6b469926292 (diff) | |
Merge branch 'maint'
* maint:
Start 1.6.0.2 maintenance cycle
tests: use "git xyzzy" form (t7200 - t9001)
tests: use "git xyzzy" form (t7000 - t7199)
Fix passwd(5) ref and reflect that commit doens't use commit-tree
improve handling of sideband message display
tests: use "git xyzzy" form (t3600 - t6999)
tests: use "git xyzzy" form (t0000 - t3599)
checkout: fix message when leaving detached HEAD
clone: fix creation of explicitly named target directory
'git foo' program identifies itself without dash in die() messages
setup_git_directory(): fix move to worktree toplevel directory
update-index: fix worktree setup
Start conforming code to "git subcmd" style
read-tree: setup worktree if merge is required
grep: fix worktree setup
diff*: fix worktree setup
Conflicts:
RelNotes
t/t3900-i18n-commit.sh
t/t7003-filter-branch.sh
Diffstat (limited to 't/t3900-i18n-commit.sh')
| -rwxr-xr-x | t/t3900-i18n-commit.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh index f4f41847f3..784c31aec9 100755 --- a/t/t3900-i18n-commit.sh +++ b/t/t3900-i18n-commit.sh @@ -18,7 +18,7 @@ test_expect_success setup ' T=$(git write-tree) && C=$(git commit-tree $T <"$TEST_DIRECTORY"/t3900/1-UTF-8.txt) && git update-ref HEAD $C && - git-tag C0 + git tag C0 ' test_expect_success 'no encoding header for base case' ' @@ -30,9 +30,9 @@ for H in ISO-8859-1 EUCJP ISO-2022-JP do test_expect_success "$H setup" ' git config i18n.commitencoding $H && - git-checkout -b $H C0 && + git checkout -b $H C0 && echo $H >F && - git-commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt + git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt ' done |