diff options
Diffstat (limited to 't/t1020-subdirectory.sh')
| -rwxr-xr-x | t/t1020-subdirectory.sh | 187 |
1 files changed, 122 insertions, 65 deletions
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh index 210e594..8e22b03 100755 --- 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,123 +17,179 @@ test_expect_success setup ' cp one original.one && cp dir/two original.two ' -HERE=`pwd` -LF=' -' test_expect_success 'update-index and ls-files' ' - cd "$HERE" && git update-index --add one && - case "`git ls-files`" in - one) echo ok one ;; + case "$(git ls-files)" in + one) echo pass one ;; *) echo bad one; exit 1 ;; esac && - cd dir && - git update-index --add two && - case "`git ls-files`" in - two) echo ok two ;; - *) echo bad two; exit 1 ;; - esac && - cd .. && - case "`git ls-files`" in - dir/two"$LF"one) echo ok both ;; + ( + cd dir && + git update-index --add two && + case "$(git ls-files)" in + two) echo pass two ;; + *) echo bad two; exit 1 ;; + esac + ) && + case "$(git ls-files)" in + dir/two"$LF"one) echo pass both ;; *) echo bad; exit 1 ;; esac ' test_expect_success 'cat-file' ' - cd "$HERE" && - two=`git ls-files -s dir/two` && - two=`expr "$two" : "[0-7]* \\([0-9a-f]*\\)"` && + two=$(git ls-files -s dir/two) && + two=$(expr "$two" : "[0-7]* \\([0-9a-f]*\\)") && echo "$two" && git cat-file -p "$two" >actual && cmp dir/two actual && - cd dir && - git cat-file -p "$two" >actual && - cmp two actual + ( + cd dir && + git cat-file -p "$two" >actual && + cmp two actual + ) ' rm -f actual dir/actual test_expect_success 'diff-files' ' - cd "$HERE" && echo a >>one && echo d >>dir/two && - case "`git diff-files --name-only`" in - dir/two"$LF"one) echo ok top ;; + case "$(git diff-files --name-only)" in + dir/two"$LF"one) echo pass top ;; *) echo bad top; exit 1 ;; esac && # diff should not omit leading paths - cd dir && - case "`git diff-files --name-only`" in - dir/two"$LF"one) echo ok subdir ;; - *) echo bad subdir; exit 1 ;; - esac && - case "`git diff-files --name-only .`" in - dir/two) echo ok subdir limited ;; - *) echo bad subdir limited; exit 1 ;; - esac + ( + cd dir && + case "$(git diff-files --name-only)" in + dir/two"$LF"one) echo pass subdir ;; + *) echo bad subdir; exit 1 ;; + esac && + case "$(git diff-files --name-only .)" in + dir/two) echo pass subdir limited ;; + *) echo bad subdir limited; exit 1 ;; + esac + ) ' test_expect_success 'write-tree' ' - cd "$HERE" && - top=`git write-tree` && + top=$(git write-tree) && echo $top && - cd dir && - sub=`git write-tree` && - echo $sub && - test "z$top" = "z$sub" + ( + cd dir && + sub=$(git write-tree) && + echo $sub && + test "z$top" = "z$sub" + ) ' test_expect_success 'checkout-index' ' - cd "$HERE" && git checkout-index -f -u one && cmp one original.one && - cd dir && - git checkout-index -f -u two && - cmp two ../original.two + ( + cd dir && + git checkout-index -f -u two && + cmp two ../original.two + ) ' test_expect_success 'read-tree' ' - cd "$HERE" && rm -f one dir/two && - tree=`git write-tree` && - git read-tree --reset -u "$tree" && + tree=$(git write-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" && - cmp two ../original.two && - cmp ../one ../original.one + ( + cd dir && + rm -f two && + read_tree_u_must_succeed --reset -u "$tree" && + cmp two ../original.two && + cmp ../one ../original.one + ) +' + +test_expect_success 'alias expansion' ' + ( + git config alias.test-status-alias status && + cd dir && + git status && + git test-status-alias + ) +' + +test_expect_success !MINGW '!alias expansion' ' + pwd >expect && + ( + git config alias.test-alias-directory !pwd && + cd dir && + git test-alias-directory >../actual + ) && + test_cmp expect actual +' + +test_expect_success 'GIT_PREFIX for !alias' ' + printf "dir/" >expect && + ( + git config alias.test-alias-directory "!sh -c \"printf \$GIT_PREFIX\"" && + cd dir && + git test-alias-directory >../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 && + GIT_EXTERNAL_DIFF=./diff git diff >../actual + git checkout -- two + ) && + test_cmp expect actual ' test_expect_success 'no file/rev ambiguity check inside .git' ' - cd "$HERE" && git commit -a -m 1 && - cd "$HERE"/.git && - git show -s HEAD + ( + cd .git && + git show -s HEAD + ) ' -test_expect_success 'no file/rev ambiguity check inside a bare repo' ' - cd "$HERE" && +test_expect_success 'no file/rev ambiguity check inside a bare repo (explicit GIT_DIR)' ' + test_when_finished "rm -fr foo.git" && git clone -s --bare .git foo.git && - cd foo.git && GIT_DIR=. git show -s HEAD + ( + cd foo.git && + # older Git needed help by exporting GIT_DIR=. + # to realize that it is inside a bare repository. + # We keep this test around for regression testing. + GIT_DIR=. git show -s HEAD + ) ' -# This still does not work as it should... -: test_expect_success 'no file/rev ambiguity check inside a bare repo' ' - cd "$HERE" && +test_expect_success 'no file/rev ambiguity check inside a bare repo' ' + test_when_finished "rm -fr foo.git" && git clone -s --bare .git foo.git && - cd foo.git && git show -s HEAD + ( + cd foo.git && + git show -s HEAD + ) ' test_expect_success SYMLINKS 'detection should not be fooled by a symlink' ' - cd "$HERE" && - rm -fr foo.git && git clone -s .git another && ln -s another yetanother && - cd yetanother/.git && - git show -s HEAD + ( + cd yetanother/.git && + git show -s HEAD + ) ' test_done |