Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3 from dajhorn/malformed-author

Fix "missing space before email" error.
  • Loading branch information...
commit f79810651960f5167369815c1686298ecedccc7f 2 parents 64fae47 + 405fa4e
@kfish authored
Showing with 4 additions and 2 deletions.
  1. +4 −2 git-bzr
View
6 git-bzr
@@ -160,14 +160,16 @@ function gitbzr_fetch_branch() {
mkdir -p "$(dirname $git_map)"
bzr fast-export --export-marks=${bzr_map} \
--git-branch=${git_branch} ${bzr_source} \
- | sed "s@commit refs/heads@commit refs/remotes@g" \
+ | sed -e 's@commit refs/heads@commit refs/remotes@g' \
+ -e '/^author <> [[:digit:]]\+ [+-][[:digit:]]\{4\}$/d' \
| git fast-import --export-marks=${git_map}
elif [ -f "$git_map" -a -f "$bzr_map" ] ; then
echo "Updating branch ${git_branch}"
old_rev="$(git rev-parse ${git_branch})"
bzr fast-export --import-marks=${bzr_map} \
--export-marks=${bzr_map} --git-branch=${git_branch} ${bzr_source} \
- | sed "s@commit refs/heads@commit refs/remotes@g" \
+ | sed -e 's@commit refs/heads@commit refs/remotes@g' \
+ -e '/^author <> [[:digit:]]\+ [+-][[:digit:]]\{4\}$/d' \
| git fast-import --quiet --export-marks=${git_map} \
--import-marks=${git_map}
new_rev="$(git rev-parse ${git_branch})"
Please sign in to comment.
Something went wrong with that request. Please try again.