changelog for Kyle's other fix, and close bug

diff --git a/CHANGELOG b/CHANGELOG
index 556be53801ccf67a22d0277d3aa4958b9e694d35..2597424c00cf0373a4680fa6fb0323a3dee3e892 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,8 @@ git-annex (8.20200310) UNRELEASED; urgency=medium
   * add --force-small: Fix a bug that, when adding a symbolic link,
     checked in the content of the file the symlink pointed to.
     Thanks, Kyle Meyer for noticing and for the patch.
+  * add --force-small: Fix failure when passed a modified submodule.
+    Thanks, Kyle Meyer for noticing and for the patch.
 
  -- Joey Hess <id@joeyh.name>  Mon, 16 Mar 2020 12:43:33 -0400
 

diff --git a/doc/bugs/add_--force-small_fails_on_modified_submodules.mdwn b/doc/bugs/add_--force-small_fails_on_modified_submodules.mdwn
index 95184491f3a737ddc2cd993698a66b36b56fafab..57d13efefe0981a47f1788c232c59ee4c37005e6 100644 (file)
--- a/doc/bugs/add_--force-small_fails_on_modified_submodules.mdwn
+++ b/doc/bugs/add_--force-small_fails_on_modified_submodules.mdwn
@@ -125,3 +125,4 @@ index 56e6fb236..72aae5f3c 100644
 [[!meta author=kyle]]
 [[!tag projects/datalad]]
 
+> [[applied|done]] --[[Joey]]

diff --git a/doc/bugs/add_--force-small_fails_on_modified_submodules/comment_1_95e4a43684338e28a74b6df8d2e5281a._comment b/doc/bugs/add_--force-small_fails_on_modified_submodules/comment_1_95e4a43684338e28a74b6df8d2e5281a._comment
new file mode 100644 (file)
index 0000000..eb7d186
--- /dev/null
+++ b/doc/bugs/add_--force-small_fails_on_modified_submodules/comment_1_95e4a43684338e28a74b6df8d2e5281a._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2020-03-26T17:15:02Z"
+ content="""
+Really well done, thank you. Applied both.
+
+About the only thing I have to add is, I wonder if it would be better for 
+--force-small to just temporarily disable the clean filter and always
+use git add. Seems that might be less likely to run into this kind of
+breakage. OTOH, it looks like you've found all the possible bugs in it
+already... So I suppose I'll wait until the next bug is found in it to
+think about doing that. ;-)
+"""]]