1
0
mirror of https://github.com/git/git.git synced 2024-09-25 20:22:43 +02:00

stash: rename test cases to be more descriptive

Rename some test cases' labels to be more descriptive and under 80
characters per line.

Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Paul-Sebastian Ungureanu 2019-02-25 23:16:12 +00:00 committed by Junio C Hamano
parent b6e531e6c6
commit ab8ad46ec7

View File

@ -612,7 +612,7 @@ test_expect_success 'stash show -p - no stashes on stack, stash-like argument' '
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'stash drop - fail early if specified stash is not a stash reference' ' test_expect_success 'drop: fail early if specified stash is not a stash ref' '
git stash clear && git stash clear &&
test_when_finished "git reset --hard HEAD && git stash clear" && test_when_finished "git reset --hard HEAD && git stash clear" &&
git reset --hard && git reset --hard &&
@ -626,7 +626,7 @@ test_expect_success 'stash drop - fail early if specified stash is not a stash r
git reset --hard HEAD git reset --hard HEAD
' '
test_expect_success 'stash pop - fail early if specified stash is not a stash reference' ' test_expect_success 'pop: fail early if specified stash is not a stash ref' '
git stash clear && git stash clear &&
test_when_finished "git reset --hard HEAD && git stash clear" && test_when_finished "git reset --hard HEAD && git stash clear" &&
git reset --hard && git reset --hard &&
@ -690,7 +690,7 @@ test_expect_success 'invalid ref of the form "n", n >= N' '
git stash drop git stash drop
' '
test_expect_success 'stash branch should not drop the stash if the branch exists' ' test_expect_success 'branch: do not drop the stash if the branch exists' '
git stash clear && git stash clear &&
echo foo >file && echo foo >file &&
git add file && git add file &&
@ -701,7 +701,7 @@ test_expect_success 'stash branch should not drop the stash if the branch exists
git rev-parse stash@{0} -- git rev-parse stash@{0} --
' '
test_expect_success 'stash branch should not drop the stash if the apply fails' ' test_expect_success 'branch: should not drop the stash if the apply fails' '
git stash clear && git stash clear &&
git reset HEAD~1 --hard && git reset HEAD~1 --hard &&
echo foo >file && echo foo >file &&
@ -715,7 +715,7 @@ test_expect_success 'stash branch should not drop the stash if the apply fails'
git rev-parse stash@{0} -- git rev-parse stash@{0} --
' '
test_expect_success 'stash apply shows status same as git status (relative to current directory)' ' test_expect_success 'apply: show same status as git status (relative to ./)' '
git stash clear && git stash clear &&
echo 1 >subdir/subfile1 && echo 1 >subdir/subfile1 &&
echo 2 >subdir/subfile2 && echo 2 >subdir/subfile2 &&
@ -1056,7 +1056,7 @@ test_expect_success 'stash push -p with pathspec shows no changes only once' '
test_i18ncmp expect actual test_i18ncmp expect actual
' '
test_expect_success 'stash push with pathspec shows no changes when there are none' ' test_expect_success 'push <pathspec>: show no changes when there are none' '
>foo && >foo &&
git add foo && git add foo &&
git commit -m "tmp" && git commit -m "tmp" &&
@ -1066,7 +1066,7 @@ test_expect_success 'stash push with pathspec shows no changes when there are no
test_i18ncmp expect actual test_i18ncmp expect actual
' '
test_expect_success 'stash push with pathspec not in the repository errors out' ' test_expect_success 'push: <pathspec> not in the repository errors out' '
>untracked && >untracked &&
test_must_fail git stash push untracked && test_must_fail git stash push untracked &&
test_path_is_file untracked test_path_is_file untracked