From: Joey Hess Date: Fri, 29 Jan 2021 18:44:03 +0000 (-0400) Subject: comment X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~98^2~114 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=93e5eb337809df669f367b3324afa05d61e84cf6;p=git-annex.git comment --- diff --git a/doc/bugs/git_annex_import_is_dangerous_if_you_have_unused_objects/comment_6_6def3c88ced56753e4b12ce221d33769._comment b/doc/bugs/git_annex_import_is_dangerous_if_you_have_unused_objects/comment_6_6def3c88ced56753e4b12ce221d33769._comment new file mode 100644 index 0000000000..905b6ca6a2 --- /dev/null +++ b/doc/bugs/git_annex_import_is_dangerous_if_you_have_unused_objects/comment_6_6def3c88ced56753e4b12ce221d33769._comment @@ -0,0 +1,17 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 6""" + date="2021-01-29T18:38:41Z" + content=""" +To the extent that this is a bug in git-annex import, it's solved +by using the new feature of importing a tree from a directory special +remote. When used that way, there's no --deduplicate or --clean-duplicates +option that causes this problem. Instead it makes git commits tracking the +content of the remote directory, and as long as you merge that remote into +your master branch, the original filename will be preserved in git. + +So once [[todo/remove_legacy_import_directory_interface]] happens, I +guess this could be considered fixed, to the extent it's a bug in git-annex +at all and not with using `git reset --hard` as I showed could lead to the +same thing in vanilla git. +"""]]