summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-08 12:00:16 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-08 12:00:17 -0700
commitb389e04031ffe4c725161a082ff748bd33688641 (patch)
treebb76d767a8c91617cccb15f15371240360b4fd64 /t
parented15e20ba36eaf85453915ef5130a770caa8d3e7 (diff)
parent20d1c6528c76242581e89c271679d35884d916dc (diff)
downloadgit-b389e04031ffe4c725161a082ff748bd33688641.tar.gz
Merge branch 'mr/opt-set-ptr'
OPT_SET_PTR() implementation was broken on IL32P64 platforms; it turns out that the macro is not used by any real user. * mr/opt-set-ptr: parse-options: remove unused OPT_SET_PTR parse-options: add cast to correct pointer type to OPT_SET_PTR MSVC: fix t0040-parse-options crash
Diffstat (limited to 't')
-rwxr-xr-xt/t0040-parse-options.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 65606df3ed..a90c86bfa3 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -30,7 +30,6 @@ String options
--string2 <str> get another string
--st <st> get another string (pervert ordering)
-o <str> get another string
- --default-string set string to default
--list <str> add str to list
Magic arguments
@@ -293,7 +292,7 @@ cat > expect <<EOF
boolean: 0
integer: 0
timestamp: 1
-string: default
+string: (not set)
abbrev: 7
verbose: 0
quiet: yes
@@ -302,8 +301,8 @@ file: (not set)
arg 00: foo
EOF
-test_expect_success 'OPT_DATE() and OPT_SET_PTR() work' '
- test-parse-options -t "1970-01-01 00:00:01 +0000" --default-string \
+test_expect_success 'OPT_DATE() works' '
+ test-parse-options -t "1970-01-01 00:00:01 +0000" \
foo -q > output 2> output.err &&
test_must_be_empty output.err &&
test_cmp expect output