summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-06-09 14:11:00 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-06-09 14:11:00 -0400
commitacc29b6b9759794a27a0c81315fd0bd5a7f1a052 (patch)
treee0cb7a52a87dc3a69dea522cca731ad16b528634 /CHANGELOG
parenta5681bf82cb2f43c4615529fb5eca3dd1f15268a (diff)
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.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG4
1 files changed, 4 insertions, 0 deletions
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 <id@joeyh.name> Fri, 27 May 2016 13:12:48 -0400