summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-11-05 13:15:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-06 06:46:45 (GMT)
commit243e0614e0f8783599b20106b50eee56d0a17332 (patch)
treebbf71c989e779c482a301624bfea17a8c66e4e2b /t
parentfe61935007b6803ce116e233316e4ff51de02be6 (diff)
downloadgit-243e0614e0f8783599b20106b50eee56d0a17332.zip
git-243e0614e0f8783599b20106b50eee56d0a17332.tar.gz
git-243e0614e0f8783599b20106b50eee56d0a17332.tar.bz2
parse-options: abbreviation engine fix.
When an option could be an ambiguous abbreviation of two options, the code used to error out. Even if an exact match would have occured later. Test and original patch by Pierre Habouzit. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t0040-parse-options.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index ae49424..462fdf2 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -18,6 +18,7 @@ string options
-s, --string <string>
get a string
--string2 <str> get another string
+ --st <st> get another string (pervert ordering)
EOF
@@ -90,4 +91,16 @@ test_expect_failure 'ambiguously abbreviated option' '
test $? != 129
'
+cat > expect << EOF
+boolean: 0
+integer: 0
+string: 123
+EOF
+
+test_expect_success 'non ambiguous option (after two options it abbreviates)' '
+ test-parse-options --st 123 > output 2> output.err &&
+ test ! -s output.err &&
+ git diff expect output
+'
+
test_done