mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2008-09-03 16:08:23 -07:00
parent 01914577ed de5d560c99
commit 9b8ae93ad9
110 changed files with 794 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
t/t3901-i18n-patch.sh
View File

@ -103,7 +103,7 @@ test_expect_success 'rebase (U/U)' '
# we want UTF-8 encoded name.
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
git checkout -b test &&
git-rebase master &&
git rebase master &&
check_encoding 2
'
@ -114,7 +114,7 @@ test_expect_success 'rebase (U/L)' '
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
git reset --hard side &&
git-rebase master &&
git rebase master &&
check_encoding 2
'
@ -126,7 +126,7 @@ test_expect_success 'rebase (L/L)' '
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
git reset --hard side &&
git-rebase master &&
git rebase master &&
check_encoding 2 8859
'
@ -139,7 +139,7 @@ test_expect_success 'rebase (L/U)' '
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
git reset --hard side &&
git-rebase master &&
git rebase master &&
check_encoding 2 8859
'
@ -211,7 +211,7 @@ test_expect_success 'rebase --merge (U/U)' '
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
git reset --hard side &&
git-rebase --merge master &&
git rebase --merge master &&
check_encoding 2
'
@ -222,7 +222,7 @@ test_expect_success 'rebase --merge (U/L)' '
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
git reset --hard side &&
git-rebase --merge master &&
git rebase --merge master &&
check_encoding 2
'
@ -234,7 +234,7 @@ test_expect_success 'rebase --merge (L/L)' '
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
git reset --hard side &&
git-rebase --merge master &&
git rebase --merge master &&
check_encoding 2 8859
'
@ -247,7 +247,7 @@ test_expect_success 'rebase --merge (L/U)' '
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
git reset --hard side &&
git-rebase --merge master &&
git rebase --merge master &&
check_encoding 2 8859
'