From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 13 Nov 2020 18:19:32 +0000 (-0400)
Subject: move: Fix a regression in the last release that made move --to not honor numcopies... 
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~102^2~66^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a30030c4a6042cadc07cbca3c54d5a3a62425881;p=git-annex.git

move: Fix a regression in the last release that made move --to not honor numcopies settings

This commit was sponsored by Svenne Krap on Patreon.
---

diff --git a/CHANGELOG b/CHANGELOG
index be011d78a3..93fa5851db 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 git-annex (8.20201104) UNRELEASED; urgency=medium
 
+  * move: Fix a regression in the last release that made move --to not
+    honor numcopies settings.
   * sync --content: Fix a bug where a file that was not preferred content
     could be transferred to a remote. This happened when the file got deleted
     after the sync started running.
diff --git a/Command/Move.hs b/Command/Move.hs
index 85ee923422..1e5a282752 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -151,7 +151,7 @@ toPerform dest removewhen key afile fastcheck isthere = do
 					when fastcheck $
 						warning "This could have failed because --fast is enabled."
 					stop
-		Right True -> logMove srcuuid destuuid False key $ \deststartedwithcopy ->
+		Right True -> logMove srcuuid destuuid True key $ \deststartedwithcopy ->
 			finish deststartedwithcopy $
 				unlessM (expectedPresent dest key) $
 					Remote.logStatus dest key InfoPresent
diff --git a/doc/bugs/move_violates_numcopies___40__regression__41__.mdwn b/doc/bugs/move_violates_numcopies___40__regression__41__.mdwn
index 757e1803ba..9ab92e08de 100644
--- a/doc/bugs/move_violates_numcopies___40__regression__41__.mdwn
+++ b/doc/bugs/move_violates_numcopies___40__regression__41__.mdwn
@@ -54,3 +54,5 @@ Relevant links:
 I'm really excited about using git-annex, and have spent 3-4 days reading documentation, past bug reports, setting up repos, transferring data, and manually testing failure cases (e.g. this one :p).
 
 Thanks for all your hard work!
+
+> [[fixed|done]] --[[Joey]]
diff --git a/doc/bugs/move_violates_numcopies___40__regression__41__/comment_2_98a0c583ed094fec0e8c666e5839c2f7._comment b/doc/bugs/move_violates_numcopies___40__regression__41__/comment_2_98a0c583ed094fec0e8c666e5839c2f7._comment
new file mode 100644
index 0000000000..a34630e89b
--- /dev/null
+++ b/doc/bugs/move_violates_numcopies___40__regression__41__/comment_2_98a0c583ed094fec0e8c666e5839c2f7._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2020-11-13T18:01:29Z"
+ content="""
+Oh what a dumb mistake, literally a copied "False" that should be "True".
+
+I'm going to move the next release up due to this regression, but
+thankfully it doesn't result in data loss, so am not going to do a crash
+priority release. Probably Monday.
+
+The test suite also has a test case for move and numcopies now. It used to be
+ok for it to only test drop and numcopies, but that changed a while back
+and it should have had one already.
+"""]]