Merge branch 'cc/tests-without-assuming-ref-files-backend'
[gitweb.git] / t / t9903-bash-prompt.sh
index 97c9b32c2ecfa608f1e9c37c1c6402a1772e4187..c3b89ae783d0b5511718be6d6b9d9978dd9131cd 100755 (executable)
@@ -148,7 +148,7 @@ test_expect_success 'prompt - inside .git directory' '
 test_expect_success 'prompt - deep inside .git directory' '
        printf " (GIT_DIR!)" >expected &&
        (
-               cd .git/refs/heads &&
+               cd .git/objects &&
                __git_ps1 >"$actual"
        ) &&
        test_cmp expected "$actual"
@@ -735,22 +735,12 @@ test_expect_success 'prompt - hide if pwd ignored - env var set, config unset, p
        test_cmp expected "$actual"
 '
 
-test_expect_success 'prompt - hide if pwd ignored - inside gitdir (stdout)' '
+test_expect_success 'prompt - hide if pwd ignored - inside gitdir' '
        printf " (GIT_DIR!)" >expected &&
        (
                GIT_PS1_HIDE_IF_PWD_IGNORED=y &&
                cd .git &&
-               __git_ps1 >"$actual" 2>/dev/null
-       ) &&
-       test_cmp expected "$actual"
-'
-
-test_expect_success 'prompt - hide if pwd ignored - inside gitdir (stderr)' '
-       printf "" >expected &&
-       (
-               GIT_PS1_HIDE_IF_PWD_IGNORED=y &&
-               cd .git &&
-               __git_ps1 >/dev/null 2>"$actual"
+               __git_ps1 >"$actual"
        ) &&
        test_cmp expected "$actual"
 '