summaryrefslogtreecommitdiff
path: root/t/t7106-reset-unborn-branch.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2013-08-24 13:34:14 -0700
committerJunio C Hamano <gitster@pobox.com>2013-08-24 23:58:44 -0700
commit95728f74b100a4feabb5c70c0e6d8bed9dc29451 (patch)
tree24f7307bbc4f570c6443f98f2b00d6841b580a50 /t/t7106-reset-unborn-branch.sh
parentc742f870ce29c145db57d7bc922bc0a4850a32a6 (diff)
downloadgit-95728f74b100a4feabb5c70c0e6d8bed9dc29451.tar.gz
reset test: modernize stylekk/tests-with-no-perl
Avoid command substitution and pipes to ensure that the exit status from each git command is tested (and in particular that any segfaults are caught). Maintain the test setup (no commits, one file named "a", another named "b") even after the last test, to make it easier to rearrange tests or add new tests after the last in the future. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7106-reset-unborn-branch.sh')
-rwxr-xr-xt/t7106-reset-unborn-branch.sh31
1 files changed, 24 insertions, 7 deletions
diff --git a/t/t7106-reset-unborn-branch.sh b/t/t7106-reset-unborn-branch.sh
index 499cd88c8f..af00ab4d88 100755
--- a/t/t7106-reset-unborn-branch.sh
+++ b/t/t7106-reset-unborn-branch.sh
@@ -11,7 +11,10 @@ test_expect_success 'setup' '
test_expect_success 'reset' '
git add a b &&
git reset &&
- test "$(git ls-files)" = ""
+
+ >expect &&
+ git ls-files >actual &&
+ test_cmp expect actual
'
test_expect_success 'reset HEAD' '
@@ -24,28 +27,42 @@ test_expect_success 'reset $file' '
rm .git/index &&
git add a b &&
git reset a &&
- test "$(git ls-files)" = "b"
+
+ echo b >expect &&
+ git ls-files >actual &&
+ test_cmp expect actual
'
test_expect_success PERL 'reset -p' '
rm .git/index &&
git add a &&
- echo y | git reset -p &&
- test "$(git ls-files)" = ""
+ echo y >yes &&
+ git reset -p <yes &&
+
+ >expect &&
+ git ls-files >actual &&
+ test_cmp expect actual
'
test_expect_success 'reset --soft is a no-op' '
rm .git/index &&
git add a &&
- git reset --soft
- test "$(git ls-files)" = "a"
+ git reset --soft &&
+
+ echo a >expect &&
+ git ls-files >actual &&
+ test_cmp expect actual
'
test_expect_success 'reset --hard' '
rm .git/index &&
git add a &&
+ test_when_finished "echo a >a" &&
git reset --hard &&
- test "$(git ls-files)" = "" &&
+
+ >expect &&
+ git ls-files >actual &&
+ test_cmp expect actual &&
test_path_is_missing a
'