summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar mbroadhead <mbroadhead@web>2017-03-03 16:59:52 +0000
committerGravatar admin <admin@branchable.com>2017-03-03 16:59:52 +0000
commit6c68a11b38a1ea6f6dc0f111d78bb6c3bee99ef9 (patch)
tree0b0129dd8e658d75d5c8fed7ba34da9e41d5248d
parent5ed7cb33d54075cde7628c104d2ba6e4f2e4414d (diff)
Added a comment
-rw-r--r--doc/bugs/git_annex_import_is_dangerous_if_you_have_unused_objects/comment_4_09b860a14bb8bd49f2067e8ddb0aacfc._comment39
1 files changed, 39 insertions, 0 deletions
diff --git a/doc/bugs/git_annex_import_is_dangerous_if_you_have_unused_objects/comment_4_09b860a14bb8bd49f2067e8ddb0aacfc._comment b/doc/bugs/git_annex_import_is_dangerous_if_you_have_unused_objects/comment_4_09b860a14bb8bd49f2067e8ddb0aacfc._comment
new file mode 100644
index 000000000..877c0ff18
--- /dev/null
+++ b/doc/bugs/git_annex_import_is_dangerous_if_you_have_unused_objects/comment_4_09b860a14bb8bd49f2067e8ddb0aacfc._comment
@@ -0,0 +1,39 @@
+[[!comment format=mdwn
+ username="mbroadhead"
+ avatar="http://cdn.libravatar.org/avatar/f3d801c0c943caab1152c4ebe8c99d51"
+ subject="comment 4"
+ date="2017-03-03T16:59:52Z"
+ content="""
+> I think there are situations where I want to completely abort a commit and
+> not have to worry about it biting me down the road.
+
+If you don't want to have to worry about a `git reset --hard` biting you down
+the road the way that it works now, just make sure you clean up after yourself.
+Example:
+
+```
+cd ~/annex
+cp /tmp/foo .
+git annex add foo
+
+# Oh, I decided I don't want \"foo\" in my annex right now, so I do a reset.
+# This will leave the data associated with \"foo\" in a git object in the git
+# store. When running 'git annex import' sometime in the future, this will
+# make any files that contain the same data as \"foo\" to be considered
+# duplicate. This will cause \"foo\" to be considered a duplicate by git annex
+# import, which we don't want in this scenario.
+git reset --hard
+
+# In order to avoid \"foo\" being a duplicate, find the dangling git object:
+git annex unused
+
+# And drop it:
+git annex dropunused N
+
+# Now \"foo\" won't be marked as a duplicate if you run any of the following
+# commands:
+git annex import /tmp/backup/foo --skip-duplicates
+git annex import /tmp/backup/foo --clean-duplicates
+git annex import /tmp/backup/foo --deduplicate
+```
+"""]]