diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-26 04:52:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-26 04:52:48 (GMT) |
| commit | 28bf4ba014c9b41679f41580fa9e1cc294b240d9 (patch) | |
| tree | a6022548d912545768678c25ffbac6c57461787e /t | |
| parent | 4b2343fa4125f73a26cb20016a3ae3a27c00dd6f (diff) | |
| parent | ad336054068074ed614d0bb54bb169e5263499d7 (diff) | |
| download | git-28bf4ba014c9b41679f41580fa9e1cc294b240d9.zip git-28bf4ba014c9b41679f41580fa9e1cc294b240d9.tar.gz git-28bf4ba014c9b41679f41580fa9e1cc294b240d9.tar.bz2 | |
Merge branch 'maint-1.6.6' into maint-1.7.0
* maint-1.6.6:
request-pull.txt: Document -p option
Check size of path buffer before writing into it
rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1502-rev-parse-parseopt.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh index e504058..3b612c6 100755 --- a/t/t1502-rev-parse-parseopt.sh +++ b/t/t1502-rev-parse-parseopt.sh @@ -79,4 +79,22 @@ test_expect_success 'test --parseopt --keep-dashdash' ' test_cmp expect output ' +cat >expect <<EOF +set -- --foo -- '--' 'arg' '--spam=ham' +EOF + +test_expect_success 'test --parseopt --keep-dashdash --stop-at-non-option with --' ' + git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo -- arg --spam=ham <optionspec >output && + test_cmp expect output +' + +cat > expect <<EOF +set -- --foo -- 'arg' '--spam=ham' +EOF + +test_expect_success 'test --parseopt --keep-dashdash --stop-at-non-option without --' ' + git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo arg --spam=ham <optionspec >output && + test_cmp expect output +' + test_done |