diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-05 13:40:49 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-05 13:40:49 -0400 |
| commit | 348dec0551c5dfdf7734a4adf0196d576593ae28 (patch) | |
| tree | 585932c41eebeb40b8ad3ded8a54de159dff1024 /debian/changelog | |
| parent | 492691812af4cab81c21ae98cd47f97dbf4cda76 (diff) | |
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.
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
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 <id@joeyh.name> Fri, 02 Jan 2015 13:35:13 -0400 |