kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t3407: rename a variable 

$dotest holds the name of the rebase state directory and was named
after the state directory used at the time the test was added. As we
no longer use that name rename the variable to reflect its purpose.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Phillip Wood 2021-09-13 15:19:15 +00:00 committed by Junio C Hamano
parent 7390c65df4
commit 54627db03a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
t/t3407-rebase-abort.sh
View File

@ -21,35 +21,35 @@ test_expect_success setup '


testrebase() { testrebase() {
type=$1 type=$1
dotest=$2 state_dir=$2


test_expect_success "rebase$type --abort" ' test_expect_success "rebase$type --abort" '
# Clean up the state from the previous one # Clean up the state from the previous one
git reset --hard pre-rebase && git reset --hard pre-rebase &&
test_must_fail git rebase$type main && test_must_fail git rebase$type main &&
test_path_is_dir "$dotest" && test_path_is_dir "$state_dir" &&
git rebase --abort && git rebase --abort &&
test_cmp_rev to-rebase pre-rebase && test_cmp_rev to-rebase pre-rebase &&
test ! -d "$dotest" test ! -d "$state_dir"
' '


test_expect_success "rebase$type --abort after --skip" ' test_expect_success "rebase$type --abort after --skip" '
# Clean up the state from the previous one # Clean up the state from the previous one
git reset --hard pre-rebase && git reset --hard pre-rebase &&
test_must_fail git rebase$type main && test_must_fail git rebase$type main &&
test_path_is_dir "$dotest" && test_path_is_dir "$state_dir" &&
test_must_fail git rebase --skip && test_must_fail git rebase --skip &&
test_cmp_rev HEAD main && test_cmp_rev HEAD main &&
git rebase --abort && git rebase --abort &&
test_cmp_rev to-rebase pre-rebase && test_cmp_rev to-rebase pre-rebase &&
test ! -d "$dotest" test ! -d "$state_dir"
' '


test_expect_success "rebase$type --abort after --continue" ' test_expect_success "rebase$type --abort after --continue" '
# Clean up the state from the previous one # Clean up the state from the previous one
git reset --hard pre-rebase && git reset --hard pre-rebase &&
test_must_fail git rebase$type main && test_must_fail git rebase$type main &&
test_path_is_dir "$dotest" && test_path_is_dir "$state_dir" &&
echo c > a && echo c > a &&
echo d >> a && echo d >> a &&
git add a && git add a &&
@ -57,7 +57,7 @@ testrebase() {
test_cmp_rev ! HEAD main && test_cmp_rev ! HEAD main &&
git rebase --abort && git rebase --abort &&
test_cmp_rev to-rebase pre-rebase && test_cmp_rev to-rebase pre-rebase &&
test ! -d "$dotest" test ! -d "$state_dir"
' '


test_expect_success "rebase$type --abort does not update reflog" ' test_expect_success "rebase$type --abort does not update reflog" '