Fix: Give correct error message for unrecognised options

The first unknown thing was always treated as the URL. So in cases where the unrecognised option was before the URL the URL caused the error.
This fixes this by checking the unknown thing if it could be meant as a option. If it is a option it is not set as the URL but produces the error.

In addition two tests are added to check the produced error messages in both cases.

fixes #522

CHANGELOG.md

@@ -5,6 +5,7 @@ Version 1.6.0-UNRELEASED
 * Fix directory creation with SFTP
 * Fix submodule handling
 * Fix/Add suport for nested branch names by allowing `/` in scope names
+* Fix error message for unrecognised options
 * Pass insecure-flag to submodules
 * Pass ssh-keys to submodules if used
 * Add support for config `disable-epsv` and `no-commit`

git-ftp

@@ -1831,7 +1831,7 @@ do
 		*)
 			# Pass thru anything that may be meant for fetch.
 			if [ -n "$1" ]; then
-				if [ -z "$URL" ]; then
+				if [ -z "$URL" ] && ! echo "$1" | egrep -q '^(-[A-Za-z])|^(--[A-Za-z0-9-]+)'; then
 					URL="$1"
 				elif [ "$ACTION" == "snapshot" -a -z "$SNAPSHOT_DIR" ]; then
 					SNAPSHOT_DIR="$1"

tests/git-ftp-test.sh

@@ -1404,6 +1404,19 @@ test_post_push_fail() {
 	assertEquals $ERROR_HOOK $rtrn
 }
 
+test_unrecognised_option(){
+	out="$($GIT_FTP init -i 2>&1 )"
+	assertEquals $ERROR_MISSING_ARGUMENTS $?
+	echo "$out" | grep -q "fatal: Unrecognised option: -i"
+	assertEquals 0 $?
+}
+test_unrecognised_option_before_url(){
+	out="$($GIT_FTP_CMD init -u $GIT_FTP_USER -p $GIT_FTP_PASSWD --invalid-option $GIT_FTP_URL 2>&1 )"
+	assertEquals $ERROR_MISSING_ARGUMENTS $?
+	echo "$out" | grep -q "fatal: Unrecognised option: --invalid-option"
+	assertEquals 0 $?
+}
+
 disabled_test_file_named_dash() {
 	echo "foobar" > -
 	assertTrue 'test failed: file named - not there as expected' "[ -f '$GIT_PROJECT_PATH/-' ]"