diff options
| author | Brandon Casey <drafnel@gmail.com> | 2011-08-27 00:59:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-27 18:12:08 (GMT) |
| commit | 4fd731240980f0f4b4565abe9092bd3d08d650e3 (patch) | |
| tree | a04a14e3c20b9b1656ea2f9e1948f83644538663 /t/t3905-stash-include-untracked.sh | |
| parent | 787513027a7d0af3c2cd2f04b85bc7136d580586 (diff) | |
| download | git-4fd731240980f0f4b4565abe9092bd3d08d650e3.zip git-4fd731240980f0f4b4565abe9092bd3d08d650e3.tar.gz git-4fd731240980f0f4b4565abe9092bd3d08d650e3.tar.bz2 | |
t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
It is common practice in the git test suite to use the file names 'actual'
and 'expect' to hold the actual and expected output of commands. So change
the name 'output' to 'actual'.
Additionally, swap the order of arguments to test_cmp when comparing
expected output and actual output so that if diff output is produced, it
describes how the actual output differs from what was expected rather than
the other way around.
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3905-stash-include-untracked.sh')
| -rwxr-xr-x | t/t3905-stash-include-untracked.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh index 4f2eedf..adc2524 100755 --- a/t/t3905-stash-include-untracked.sh +++ b/t/t3905-stash-include-untracked.sh @@ -23,13 +23,13 @@ test_expect_success 'stash save --include-untracked some dirty working directory ' cat > expect <<EOF +?? actual ?? expect -?? output EOF test_expect_success 'stash save --include-untracked cleaned the untracked files' ' - git status --porcelain > output - test_cmp output expect + git status --porcelain >actual + test_cmp expect actual ' cat > expect.diff <<EOF @@ -47,10 +47,10 @@ EOF test_expect_success 'stash save --include-untracked stashed the untracked files' ' test "!" -f file2 && - git diff HEAD..stash^3 -- file2 > output && - test_cmp output expect.diff && - git ls-tree --name-only stash^3: > output && - test_cmp output expect.lstree + git diff HEAD..stash^3 -- file2 >actual && + test_cmp expect.diff actual && + git ls-tree --name-only stash^3: >actual && + test_cmp expect.lstree actual ' test_expect_success 'stash save --patch --include-untracked fails' ' test_must_fail git stash --patch --include-untracked @@ -64,15 +64,15 @@ git clean --force --quiet cat > expect <<EOF M file +?? actual ?? expect ?? file2 -?? output EOF test_expect_success 'stash pop after save --include-untracked leaves files untracked again' ' git stash pop && - git status --porcelain > output - test_cmp output expect + git status --porcelain >actual + test_cmp expect actual ' git clean --force --quiet @@ -96,8 +96,8 @@ EOF test_expect_success 'stash save --include-untracked dirty index got stashed' ' git stash pop --index && - git diff --cached > output && - test_cmp output expect + git diff --cached >actual && + test_cmp expect actual ' git reset > /dev/null |