From cdd715e6860a229c25e25d6f57144835409d4b9d Mon Sep 17 00:00:00 2001 From: Roman Hoog Antink Date: Wed, 21 Aug 2013 13:47:07 +0200 Subject: [PATCH 1/2] fix git-svn parameter passing Single character (resp. short) parameters like -b SOMETHING were passed in long parameter syntax, namely as -b=SOMETHING. This patch can pass on both long and short parameters from the user to git-svn. --- git-svn-migrate.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-svn-migrate.sh b/git-svn-migrate.sh index 1fd7a5f..d270060 100755 --- a/git-svn-migrate.sh +++ b/git-svn-migrate.sh @@ -137,8 +137,10 @@ until [[ -z "$1" ]]; do * ) # Pass any unknown parameters to git-svn directly. if [[ $value == '' ]]; then gitsvn_params="$gitsvn_params $flag_delimiter$parameter"; - else + elif [[ ${#parameter} -gt 1 ]]; then gitsvn_params="$gitsvn_params $flag_delimiter$parameter=$value"; + else + gitsvn_params="$gitsvn_params $flag_delimiter$parameter $value"; fi;; esac From 63c4b54f312768fa2a98f8a6a945479efe5c6ea6 Mon Sep 17 00:00:00 2001 From: Roman Hoog Antink Date: Mon, 2 Sep 2013 17:57:06 +0200 Subject: [PATCH 2/2] create .gitignore only if not empty --- git-svn-migrate.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git-svn-migrate.sh b/git-svn-migrate.sh index d270060..b2be7cb 100755 --- a/git-svn-migrate.sh +++ b/git-svn-migrate.sh @@ -210,8 +210,10 @@ do fi cd $tmp_destination; git svn show-ignore --id trunk >> .gitignore; - git add .gitignore; - git commit --author="git-svn-migrate " -m 'Convert svn:ignore properties to .gitignore.'; + if [ -s .gitignore ]; then + git add .gitignore; + git commit --author="git-svn-migrate " -m 'Convert svn:ignore properties to .gitignore.'; + fi # Push to final bare repository and remove temp repository. echo "- Pushing to new bare repository..." >&2;