From 173465592fb26d667ff1bdf4168483a15ea3d269 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 26 Mar 2020 13:18:41 -0400 Subject: [PATCH] changelog for Kyle's other fix, and close bug --- CHANGELOG | 2 ++ ...--force-small_fails_on_modified_submodules.mdwn | 1 + ...ent_1_95e4a43684338e28a74b6df8d2e5281a._comment | 14 ++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 doc/bugs/add_--force-small_fails_on_modified_submodules/comment_1_95e4a43684338e28a74b6df8d2e5281a._comment diff --git a/CHANGELOG b/CHANGELOG index 556be53801..2597424c00 100644 --- 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 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 95184491f3..57d13efefe 100644 --- 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 index 0000000000..eb7d186562 --- /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. ;-) +"""]]