Merge branch 'jc/commit-amend-no-edit'

diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index 1fd187c5eb188671934f6afe85ca5003c529a942..e23ac0e69da8d3dba32f0d256a249a987356e825 100755 (executable)
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -7,6 +7,7 @@ test_description='Try various core-level commands in subdirectory.
 '
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-read-tree.sh
 
 test_expect_success setup '
        long="a b c d e f g h i j k l m n o p q r s t u v w x y z" &&
@@ -16,8 +17,6 @@ test_expect_success setup '
        cp one original.one &&
        cp dir/two original.two
 '
-LF='
-'
 
 test_expect_success 'update-index and ls-files' '
        git update-index --add one &&
@@ -98,13 +97,13 @@ test_expect_success 'checkout-index' '
 test_expect_success 'read-tree' '
        rm -f one dir/two &&
        tree=`git write-tree` &&
-       git read-tree --reset -u "$tree" &&
+       read_tree_u_must_succeed --reset -u "$tree" &&
        cmp one original.one &&
        cmp dir/two original.two &&
        (
                cd dir &&
                rm -f two &&
-               git read-tree --reset -u "$tree" &&
+               read_tree_u_must_succeed --reset -u "$tree" &&
                cmp two ../original.two &&
                cmp ../one ../original.one
        )
@@ -118,6 +117,43 @@ test_expect_success 'alias expansion' '
                git ss
        )
 '
+
+test_expect_success NOT_MINGW '!alias expansion' '
+       pwd >expect &&
+       (
+               git config alias.test !pwd &&
+               cd dir &&
+               git test >../actual
+       ) &&
+       test_cmp expect actual
+'
+
+test_expect_success 'GIT_PREFIX for !alias' '
+       printf "dir/" >expect &&
+       (
+               git config alias.test "!sh -c \"printf \$GIT_PREFIX\"" &&
+               cd dir &&
+               git test >../actual
+       ) &&
+       test_cmp expect actual
+'
+
+test_expect_success 'GIT_PREFIX for built-ins' '
+       # Use GIT_EXTERNAL_DIFF to test that the "diff" built-in
+       # receives the GIT_PREFIX variable.
+       printf "dir/" >expect &&
+       printf "#!/bin/sh\n" >diff &&
+       printf "printf \"\$GIT_PREFIX\"" >>diff &&
+       chmod +x diff &&
+       (
+               cd dir &&
+               printf "change" >two &&
+               env GIT_EXTERNAL_DIFF=./diff git diff >../actual
+               git checkout -- two
+       ) &&
+       test_cmp expect actual
+'
+
 test_expect_success 'no file/rev ambiguity check inside .git' '
        git commit -a -m 1 &&
        (