From acc29b6b9759794a27a0c81315fd0bd5a7f1a052 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Jun 2016 14:11:00 -0400 Subject: Fix bug in initialization of clone from a repo with an adjusted branch that had not been synced back to master. This bug caused broken tree objects to get built by a later git annex sync. This is a somewhat unlikely but not impossible situation, and the test suite's union_merge_regression test tickled it when it was run on FAT. --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index b9c7792c0..0db6d1e56 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,10 @@ git-annex (6.20160528) UNRELEASED; urgency=medium and a directory with the same name when in an adjusted branch. * Avoid a crash if getpwuid does not work, when querying the user's full name. + * Fix bug in initialization of clone from a repo with an adjusted branch + that had not been synced back to master. + (This bug caused broken tree objects to get built by a later git annex + sync.) -- Joey Hess Fri, 27 May 2016 13:12:48 -0400 -- cgit v1.2.3