From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 21 Mar 2022 20:02:24 +0000 (-0400)
Subject: reorder
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~75^2~108
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=42b6f24e67cb1f381d1fd0101318f822a8420d9e;p=git-annex.git

reorder
---

diff --git a/CHANGELOG b/CHANGELOG
index 0f5213f666..cf4ac0303b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,19 @@
 git-annex (10.20220223) UNRELEASED; urgency=medium
 
+  * Directory special remotes with importtree=yes have changed to once more 
+    take inodes into account. This will cause extra work when importing
+    from a directory on a FAT filesystem that changes inodes on every
+    mount. To avoid that extra work, set ignoreinodes=yes when initializing
+    a new directory special remote, or change the configuration of your
+    existing remote:
+      git-annex enableremote foo ignoreinodes=yes
+  * add: Avoid unncessarily converting a newly unlocked file to be stored
+    in git when it is not modified, even when annex.largefiles does not
+    match it.
+  * The above change to add fixes a reversion in version 10.20220222,
+    where git-annex unlock followed by git-annex add, followed by git
+    commit file could result in git thinking the file was modified
+    after the commit.
   * Detect when an unlocked file whose content is not present has gotten
     some other content appended to it, and avoid treating it as a pointer
     file, so that appended content will not be checked into git, but will
@@ -12,29 +26,15 @@ git-annex (10.20220223) UNRELEASED; urgency=medium
   * Run annex.thawcontent-command before deleting an object file,
     in case annex.freezecontent-command did something that would prevent
     deletion.
-  * Propagate nonzero exit status from git ls-files when a specified
+  * Fix propagation of nonzero exit status from git ls-files when a specified
     file does not exist, or a specified directory does not contain
     any files checked into git.
-  * Avoid git-annex test being very slow when run from within the
-    standalone linux tarball or OSX app.
   * Fix build with aeson 2.0.
     Thanks, sternenseemann for the patch.
+  * Avoid git-annex test being very slow when run from within the
+    standalone linux tarball or OSX app.
   * test: Runs tests in parallel to speed up the test suite.
   * test: Added --jobs option.
-  * Directory special remotes with importtree=yes have changed to once more 
-    take inodes into account. This will cause extra work when importing
-    from a directory on a FAT filesystem that changes inodes on every
-    mount. To avoid that extra work, set ignoreinodes=yes when initializing
-    a new directory special remote, or change the configuration of your
-    existing remote:
-      git-annex enableremote foo ignoreinodes=yes
-  * add: Avoid unncessarily converting a newly unlocked file to be stored
-    in git when it is not modified, even when annex.largefiles does not
-    match it.
-  * The above change to add fixes a reversion in version 10.20220222,
-    where git-annex unlock followed by git-annex add, followed by git
-    commit file could result in git thinking the file was modified
-    after the commit.
 
  -- Joey Hess <id@joeyh.name>  Wed, 23 Feb 2022 14:14:09 -0400