Make makerepo set the Git merge remote

branch.master.remote previously used to default to origin, which has
recently been changed; it now needs to be set explicitly, which this
patch does.

Closes Debian bug #470517.

Signed-off-by: martin f. krafft <madduck@madduck.net>

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index a97c060c2a15d81f85a90f13722672c8c6bb94ea..6ae3e28a3a7ee8a9cdc8bd769439c7e8433406cb 100755 (executable)
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -62,6 +62,7 @@ git)
        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"
 ;;