t3407: run tests in $TEST_DIRECTORY
Commit 97b88dd58c ("git-rebase.sh: Fix --merge --abort failures when path contains whitespace", 2008-05-04) started running these tests in a subdirectory with a space in its name. At that time $TEST_DIRECTORY did not contain a space but shortly after in 4a7aaccd83 ("Rename the test trash directory to contain spaces.", 2008-05-04) $TEST_DIRECTORY was changed to contain a space so we no longer need to run these tests in a subdirectory. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Sep 13, 2021 at 15:19 UTC
f20c1fb296be2a18426541573146159fdbcc668c
1 file changed
-13
t/t3407-rebase-abort.sh
-13
@@ -7,13 +7,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7
8
. ./test-lib.sh
9
10
-### Test that we handle space characters properly
11
-work_dir="$(pwd)/test dir"
12
-
10
test_expect_success setup '
14
- mkdir -p "$work_dir" &&
15
- cd "$work_dir" &&
16
- git init &&
11
echo a > a &&
12
git add a &&
13
git commit -m a &&
@@ -37,7 +31,6 @@ testrebase() {
31
dotest=$2
32
33
test_expect_success "rebase$type --abort" '
40
- cd "$work_dir" &&
34
# Clean up the state from the previous one
35
git reset --hard pre-rebase &&
36
test_must_fail git rebase$type main &&
@@ -48,7 +41,6 @@ testrebase() {
41
'
42
43
test_expect_success "rebase$type --abort after --skip" '
51
- cd "$work_dir" &&
44
# Clean up the state from the previous one
45
git reset --hard pre-rebase &&
46
test_must_fail git rebase$type main &&
@@ -61,7 +53,6 @@ testrebase() {
53
'
54
55
test_expect_success "rebase$type --abort after --continue" '
64
- cd "$work_dir" &&
56
# Clean up the state from the previous one
57
git reset --hard pre-rebase &&
58
test_must_fail git rebase$type main &&
@@ -77,7 +68,6 @@ testrebase() {
68
'
69
70
test_expect_success "rebase$type --abort does not update reflog" '
80
- cd "$work_dir" &&
71
# Clean up the state from the previous one
72
git reset --hard pre-rebase &&
73
git reflog show to-rebase > reflog_before &&
@@ -89,7 +79,6 @@ testrebase() {
79
'
80
81
test_expect_success 'rebase --abort can not be used with other options' '
92
- cd "$work_dir" &&
82
# Clean up the state from the previous one
83
git reset --hard pre-rebase &&
84
test_must_fail git rebase$type main &&
@@ -103,7 +92,6 @@ testrebase " --apply" .git/rebase-apply
92
testrebase " --merge" .git/rebase-merge
93
94
test_expect_success 'rebase --apply --quit' '
106
- cd "$work_dir" &&
95
# Clean up the state from the previous one
96
git reset --hard pre-rebase &&
97
test_must_fail git rebase --apply main &&
@@ -115,7 +103,6 @@ test_expect_success 'rebase --apply --quit' '
103
'
104
105
test_expect_success 'rebase --merge --quit' '
118
- cd "$work_dir" &&
106
# Clean up the state from the previous one
107
git reset --hard pre-rebase &&
108
test_must_fail git rebase --merge main &&