From 348dec0551c5dfdf7734a4adf0196d576593ae28 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Jan 2015 13:40:49 -0400 Subject: sync: Fix an edge case where syncing in a bare repository would try to merge and so fail. In the case where a remote of the bare repo has a fetch = configuration, refs/remotes/origin/master will exist, and so the merge code path tried to run in the bare repo. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 8fc917235..1efbdd9da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ git-annex (5.20141232) UNRELEASED; urgency=medium Closes: #774494 * Fix build with process 1.2.1.0. * Android: Provide a version built with -fPIE -pie to support Android 5.0. + * sync: Fix an edge case where syncing in a bare repository would try to + merge and so fail. -- Joey Hess Fri, 02 Jan 2015 13:35:13 -0400 -- cgit v1.2.3