summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-27 11:45:13 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-27 11:45:13 -0400
commitd76362a5986f004a61ed5484f95a592e33ef5e43 (patch)
treeb1b55e8a13efddf3aa1d24c3002071c4ced857c6 /CHANGELOG
parente184360d5d2225b50117b0deddb28c0537dfb181 (diff)
Split lines in the git-annex branch on \r as well as \n, to deal with \r\n terminated lines written by some versions of git-annex on Windows.
This fixes strange displays in some cases, including whereis showing many duplicate locations, and showing more total copies than actually exist. It's unknown if that lead to data loss when eg, dropping. At the moment, it seems unlikely it could, since the UUID with \r's appended is not the same as a UUID without, and so no remote matches it. It's also unknown if \r's can leak in on windows, perhaps when merging the git-annex branch.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e58c6eeda..0c5b6db83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
git-annex (6.20160512) UNRELEASED; urgency=medium
+ * Split lines in the git-annex branch on \r as well as \n, to deal
+ with \r\n terminated lines written by some versions of git-annex on
+ Windows. This fixes strange displays in some cases.
* Change git annex info remote encryption description to use wording
closer to what's used in initremote.
* webapp: Avoid confusing display of dead remotes.