diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-15 15:42:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-15 15:42:58 -0400 |
| commit | 41bae956f1c349779af100195891248e014d1c12 (patch) | |
| tree | 6b3e0b123d25757808cc3590f985089860390665 /debian/changelog | |
| parent | b2d4b7eb8fe90997b257d841c24ed91e9d93d601 (diff) | |
| parent | 5d2f4ce5c605bef48a1a22eb72b99a532ffbfe25 (diff) | |
Merge branch 'master' into tasty-tests
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 975818366..adb8e0c32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,15 @@ git-annex (5.20131102) UNRELEASED; urgency=low * repair: Handle case where index file is corrupt, but all objects are ok. * assistant: Notice on startup when the index file is corrupt, and auto-repair. + * Fix direct mode merge bug when a direct mode file was deleted and replaced + with a directory. An ordering problem caused the directory to not get + created in this case. + Thanks to Tim for the test case. + * Direct mode .git/annex/objects directories are no longer left writable, + because that allowed writing to symlinks of files that are not present, + which followed the link and put bad content in an object location. + Thanks to Tim for the test case. + * fsck: Fix up .git/annex/object directory permissions. -- Joey Hess <joeyh@debian.org> Wed, 06 Nov 2013 16:14:14 -0400 |