From: martin f. krafft <madduck@madduck.net>
Date: Tue, 11 Mar 2008 18:18:05 +0000 (+0100)
Subject: Make makerepo set the Git merge remote
X-Git-Tag: 2.41~161
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=227107b21864dedb40995875c6a68c1a2a665f9a;p=ikiwiki.git

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 a97c060c2..6ae3e28a3 100755
--- 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"
 ;;