Merge commit 'smcv/aggregate' into aggregate

[git.ikiwiki.info.git] / ikiwiki-makerepo

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index dd23b4638a88b76367e638719d4e58247b8edfed..d249e5e754c00a36ee29b6b6d667017c6b71bdda 100755 (executable)
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -25,7 +25,7 @@ if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ]; then
                echo "repository $repository already exists, aborting" >&2 
                exit 1
        fi
-       repository="$(perl -e 'use Cwd q{abs_path}; print abs_path(shift)' $repository)"
+       repository="$(perl -e 'use Cwd q{abs_path}; $r=shift; $r=~s/\/*$//; print abs_path($r)' $repository)"
        if [ -z "$repository" ]; then
                echo "internal error finding repository abs_path" >&2
                exit 1
@@ -58,10 +58,12 @@ git)
        cd "$srcdir"
        git init
        echo /.ikiwiki > .gitignore
+       echo /recentchanges >> .gitignore
        git add .
        git commit -m "initial commit"
        git remote add origin "$repository"
        git config branch.master.merge refs/heads/master
+       git config branch.master.remote origin
        git push --all
        echo "Directory $srcdir is now a clone of $rcs repository $repository"
 ;;