Skip to content

fix git-svn parameter passing #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix git-svn parameter passing #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdd715e
fix git-svn parameter passing
Aug 21, 2013
63c4b54
create .gitignore only if not empty
Sep 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions git-svn-migrate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -208,8 +210,10 @@ do
fi
cd $tmp_destination;
git svn show-ignore --id trunk >> .gitignore;
git add .gitignore;
git commit --author="git-svn-migrate <[email protected]>" -m 'Convert svn:ignore properties to .gitignore.';
if [ -s .gitignore ]; then
git add .gitignore;
git commit --author="git-svn-migrate <[email protected]>" -m 'Convert svn:ignore properties to .gitignore.';
fi

# Push to final bare repository and remove temp repository.
echo "- Pushing to new bare repository..." >&2;
Expand Down