summaryrefslogtreecommitdiff
path: root/t/t9300-fast-import.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2010-11-28 13:42:46 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-01 13:26:52 -0800
commita9ff277e583782346181f431784e48046b0dfaa9 (patch)
tree01a2fc07ee976a9f9cbd32d8c5fec906ffc19009 /t/t9300-fast-import.sh
parentMerge branch 'cb/maint-orphan-merge-noclobber' (diff)
downloadtgif-a9ff277e583782346181f431784e48046b0dfaa9.tar.xz
fast-import: stricter parsing of integer options
Check the result from strtoul to avoid accepting arguments like --depth=-1 and --active-branches=foo,bar,baz. Requested-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9300-fast-import.sh')
-rwxr-xr-xt/t9300-fast-import.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 14d17691b1..c80bb0cf10 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -1659,6 +1659,14 @@ test_expect_success 'R: unknown commandline options are rejected' '\
test_must_fail git fast-import --non-existing-option < /dev/null
'
+test_expect_success 'R: die on invalid option argument' '
+ echo "option git active-branches=-5" |
+ test_must_fail git fast-import &&
+ echo "option git depth=" |
+ test_must_fail git fast-import &&
+ test_must_fail git fast-import --depth="5 elephants" </dev/null
+'
+
cat >input <<EOF
option non-existing-vcs non-existing-option
EOF