From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Sep 2008 23:08:23 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~274
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b8ae93ad92efef59649a3a7c4bed162d2051059;p=git.git

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

9b8ae93ad92efef59649a3a7c4bed162d2051059
diff --cc t/t3900-i18n-commit.sh
index f4f41847f,f31353323..784c31aec
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@@ -16,9 -16,9 +16,9 @@@ test_expect_success setup 
  	: >F &&
  	git add F &&
  	T=$(git write-tree) &&
 -	C=$(git commit-tree $T <../t3900/1-UTF-8.txt) &&
 +	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 +30,9 @@@ for H in ISO-8859-1 EUCJP ISO-2022-J
  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 ../t3900/$H.txt
++		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
  	'
  done
  
diff --cc t/t3901-i18n-patch.sh
index f68ff5305,567760e1d..7655da3f8
--- a/t/t3901-i18n-patch.sh
+++ b/t/t3901-i18n-patch.sh
@@@ -101,9 -101,9 +101,9 @@@ test_expect_success 'rebase (U/U)' 
  
  	# The result will be committed by GIT_COMMITTER_NAME --
  	# we want UTF-8 encoded name.
 -	. ../t3901-utf8.txt &&
 +	. "$TEST_DIRECTORY"/t3901-utf8.txt &&
  	git checkout -b test &&
- 	git-rebase master &&
+ 	git rebase master &&
  
  	check_encoding 2
  '
@@@ -111,10 -111,10 +111,10 @@@
  test_expect_success 'rebase (U/L)' '
  	git config i18n.commitencoding UTF-8 &&
  	git config i18n.logoutputencoding ISO-8859-1 &&
 -	. ../t3901-utf8.txt &&
 +	. "$TEST_DIRECTORY"/t3901-utf8.txt &&
  
  	git reset --hard side &&
- 	git-rebase master &&
+ 	git rebase master &&
  
  	check_encoding 2
  '
@@@ -123,10 -123,10 +123,10 @@@ test_expect_success 'rebase (L/L)' 
  	# In this test we want ISO-8859-1 encoded commits as the result
  	git config i18n.commitencoding ISO-8859-1 &&
  	git config i18n.logoutputencoding ISO-8859-1 &&
 -	. ../t3901-8859-1.txt &&
 +	. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
  
  	git reset --hard side &&
- 	git-rebase master &&
+ 	git rebase master &&
  
  	check_encoding 2 8859
  '
@@@ -136,10 -136,10 +136,10 @@@ test_expect_success 'rebase (L/U)' 
  	# to get ISO-8859-1 results.
  	git config i18n.commitencoding ISO-8859-1 &&
  	git config i18n.logoutputencoding UTF-8 &&
 -	. ../t3901-8859-1.txt &&
 +	. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
  
  	git reset --hard side &&
- 	git-rebase master &&
+ 	git rebase master &&
  
  	check_encoding 2 8859
  '
@@@ -208,10 -208,10 +208,10 @@@ test_expect_success 'cherry-pick(L/U)' 
  test_expect_success 'rebase --merge (U/U)' '
  	git config i18n.commitencoding UTF-8 &&
  	git config i18n.logoutputencoding UTF-8 &&
 -	. ../t3901-utf8.txt &&
 +	. "$TEST_DIRECTORY"/t3901-utf8.txt &&
  
  	git reset --hard side &&
- 	git-rebase --merge master &&
+ 	git rebase --merge master &&
  
  	check_encoding 2
  '
@@@ -219,10 -219,10 +219,10 @@@
  test_expect_success 'rebase --merge (U/L)' '
  	git config i18n.commitencoding UTF-8 &&
  	git config i18n.logoutputencoding ISO-8859-1 &&
 -	. ../t3901-utf8.txt &&
 +	. "$TEST_DIRECTORY"/t3901-utf8.txt &&
  
  	git reset --hard side &&
- 	git-rebase --merge master &&
+ 	git rebase --merge master &&
  
  	check_encoding 2
  '
@@@ -231,10 -231,10 +231,10 @@@ test_expect_success 'rebase --merge (L/
  	# In this test we want ISO-8859-1 encoded commits as the result
  	git config i18n.commitencoding ISO-8859-1 &&
  	git config i18n.logoutputencoding ISO-8859-1 &&
 -	. ../t3901-8859-1.txt &&
 +	. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
  
  	git reset --hard side &&
- 	git-rebase --merge master &&
+ 	git rebase --merge master &&
  
  	check_encoding 2 8859
  '
@@@ -244,10 -244,10 +244,10 @@@ test_expect_success 'rebase --merge (L/
  	# to get ISO-8859-1 results.
  	git config i18n.commitencoding ISO-8859-1 &&
  	git config i18n.logoutputencoding UTF-8 &&
 -	. ../t3901-8859-1.txt &&
 +	. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
  
  	git reset --hard side &&
- 	git-rebase --merge master &&
+ 	git rebase --merge master &&
  
  	check_encoding 2 8859
  '
diff --cc t/t7001-mv.sh
index 78167980b,66bb1264f..575ef5beb
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@@ -6,9 -6,9 +6,9 @@@ test_description='git mv in subdirs
  test_expect_success \
      'prepare reference tree' \
      'mkdir path0 path1 &&
 -     cp ../../COPYING path0/COPYING &&
 +     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
       git add path0/COPYING &&
-      git-commit -m add -a'
+      git commit -m add -a'
  
  test_expect_success \
      'moving the file out of subdirectory' \
@@@ -40,9 -40,9 +40,9 @@@ test_expect_success 
  
  test_expect_success \
      'adding another file' \
 -    'cp ../../README path0/README &&
 +    'cp "$TEST_DIRECTORY"/../README path0/README &&
       git add path0/README &&
-      git-commit -m add2 -a'
+      git commit -m add2 -a'
  
  test_expect_success \
      'moving whole subdirectory' \
diff --cc t/t7003-filter-branch.sh
index 95f13a8b2,182aea426..b0a9d7d53
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@@ -96,9 -96,7 +96,9 @@@ test_expect_success 'filter subdirector
  	test_tick &&
  	git commit -m "again not subdir" &&
  	git branch sub &&
 -	git filter-branch -f --subdirectory-filter subdir refs/heads/sub
 +	git branch sub-earlier HEAD~2 &&
- 	git-filter-branch -f --subdirectory-filter subdir \
++	git filter-branch -f --subdirectory-filter subdir \
 +		refs/heads/sub refs/heads/sub-earlier
  '
  
  test_expect_success 'subdirectory filter result looks okay' '
diff --cc t/t7101-reset.sh
index ffaeb3983,c4ef19e40..96e163f08
--- a/t/t7101-reset.sh
+++ b/t/t7101-reset.sh
@@@ -9,9 -9,9 +9,9 @@@ test_description='git reset should cul
  test_expect_success \
      'creating initial files' \
      'mkdir path0 &&
 -     cp ../../COPYING path0/COPYING &&
 +     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
       git add path0/COPYING &&
-      git-commit -m add -a'
+      git commit -m add -a'
  
  test_expect_success \
      'creating second files' \