mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

sync: Fix an edge case where syncing in a bare repository would try to merge and so fail.

Browse source 
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.
This commit is contained in:
Joey Hess 2015-01-05 13:40:49 -04:00
parent 18f74b52bd
commit 584eac78e6
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -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 <id@joeyh.name> Fri, 02 Jan 2015 13:35:13 -0400