Re: [PATCH 3/3] t/t7106-reset-unborn-branch.sh: Add PERL prerequisite
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Aug 24, 2013, 20:34 UTC
- Message-ID
- <20130824203414.GD2960@elie.Belkin>
- In-Reply-To
- <1377316906-70338-4-git-send-email-draenog@pld-linux.org>
Kacper Kornet wrote:
> Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
Thanks.
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Here's a style cleanup on top.
-- >8 -- Subject: reset test: modernize style
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> --- t/t7106-reset-unborn-branch.sh | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/t/t7106-reset-unborn-branch.sh b/t/t7106-reset-unborn-branch.sh index 499cd88c..af00ab4d 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 '
-- 1.8.4.rc4