From 0e098b6d79fbcab763874f2b6fde5aa82144d150 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Thu, 27 Aug 2009 09:38:27 +0200 Subject: Make test case number unique Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano diff --git a/t/t4037-whitespace-status.sh b/t/t4037-whitespace-status.sh deleted file mode 100755 index a30b03b..0000000 --- a/t/t4037-whitespace-status.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -test_description='diff --exit-code with whitespace' -. ./test-lib.sh - -test_expect_success setup ' - mkdir a b && - echo >c && - echo >a/d && - echo >b/e && - git add . && - test_tick && - git commit -m initial && - echo " " >a/d && - test_tick && - git commit -a -m second && - echo " " >a/d && - echo " " >b/e && - git add a/d -' - -test_expect_success 'diff-tree --exit-code' ' - test_must_fail git diff --exit-code HEAD^ HEAD && - test_must_fail git diff-tree --exit-code HEAD^ HEAD -' - -test_expect_success 'diff-tree -b --exit-code' ' - git diff -b --exit-code HEAD^ HEAD && - git diff-tree -b -p --exit-code HEAD^ HEAD && - git diff-tree -b --exit-code HEAD^ HEAD -' - -test_expect_success 'diff-index --cached --exit-code' ' - test_must_fail git diff --cached --exit-code HEAD && - test_must_fail git diff-index --cached --exit-code HEAD -' - -test_expect_success 'diff-index -b -p --cached --exit-code' ' - git diff -b --cached --exit-code HEAD && - git diff-index -b -p --cached --exit-code HEAD -' - -test_expect_success 'diff-index --exit-code' ' - test_must_fail git diff --exit-code HEAD && - test_must_fail git diff-index --exit-code HEAD -' - -test_expect_success 'diff-index -b -p --exit-code' ' - git diff -b --exit-code HEAD && - git diff-index -b -p --exit-code HEAD -' - -test_expect_success 'diff-files --exit-code' ' - test_must_fail git diff --exit-code && - test_must_fail git diff-files --exit-code -' - -test_expect_success 'diff-files -b -p --exit-code' ' - git diff -b --exit-code && - git diff-files -b -p --exit-code -' - -test_done diff --git a/t/t4040-whitespace-status.sh b/t/t4040-whitespace-status.sh new file mode 100755 index 0000000..a30b03b --- /dev/null +++ b/t/t4040-whitespace-status.sh @@ -0,0 +1,63 @@ +#!/bin/sh + +test_description='diff --exit-code with whitespace' +. ./test-lib.sh + +test_expect_success setup ' + mkdir a b && + echo >c && + echo >a/d && + echo >b/e && + git add . && + test_tick && + git commit -m initial && + echo " " >a/d && + test_tick && + git commit -a -m second && + echo " " >a/d && + echo " " >b/e && + git add a/d +' + +test_expect_success 'diff-tree --exit-code' ' + test_must_fail git diff --exit-code HEAD^ HEAD && + test_must_fail git diff-tree --exit-code HEAD^ HEAD +' + +test_expect_success 'diff-tree -b --exit-code' ' + git diff -b --exit-code HEAD^ HEAD && + git diff-tree -b -p --exit-code HEAD^ HEAD && + git diff-tree -b --exit-code HEAD^ HEAD +' + +test_expect_success 'diff-index --cached --exit-code' ' + test_must_fail git diff --cached --exit-code HEAD && + test_must_fail git diff-index --cached --exit-code HEAD +' + +test_expect_success 'diff-index -b -p --cached --exit-code' ' + git diff -b --cached --exit-code HEAD && + git diff-index -b -p --cached --exit-code HEAD +' + +test_expect_success 'diff-index --exit-code' ' + test_must_fail git diff --exit-code HEAD && + test_must_fail git diff-index --exit-code HEAD +' + +test_expect_success 'diff-index -b -p --exit-code' ' + git diff -b --exit-code HEAD && + git diff-index -b -p --exit-code HEAD +' + +test_expect_success 'diff-files --exit-code' ' + test_must_fail git diff --exit-code && + test_must_fail git diff-files --exit-code +' + +test_expect_success 'diff-files -b -p --exit-code' ' + git diff -b --exit-code && + git diff-files -b -p --exit-code +' + +test_done -- cgit v0.10.2-6-g49f6