summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-04-07 12:34:19 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-04-07 12:34:19 -0400
commitd772f376f6d683692e322f69f93de07ce18a2e28 (patch)
tree2b51a43c4d7622f02f3851a2123b27e14826f8b3
parent9cbe5068f837d71dbcfd884d5ebfcb105600a85d (diff)
partial analysis
-rw-r--r--doc/bugs/committing_files_into_git_doesn__39__t_work_with_explicitly_given_paths_in_V6/comment_1_1922f38b3620e94e90b16e3c14f59add._comment18
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/bugs/committing_files_into_git_doesn__39__t_work_with_explicitly_given_paths_in_V6/comment_1_1922f38b3620e94e90b16e3c14f59add._comment b/doc/bugs/committing_files_into_git_doesn__39__t_work_with_explicitly_given_paths_in_V6/comment_1_1922f38b3620e94e90b16e3c14f59add._comment
new file mode 100644
index 000000000..5faf6b71c
--- /dev/null
+++ b/doc/bugs/committing_files_into_git_doesn__39__t_work_with_explicitly_given_paths_in_V6/comment_1_1922f38b3620e94e90b16e3c14f59add._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2017-04-07T16:24:59Z"
+ content="""
+The root problem is, you have set annex.largefiles=nothing temporarily when
+adding the file. But, when git commit re-smudges the file, that is not set,
+so git-annex generates a v6 pointer, which is what gets committed.
+
+I don't think you will have these problems if use use .gitattributes to
+configure annex.largefiles.
+
+(There is something going on that I don't quite understand with why
+git status then thinks the file has changed. git diff --cached shows a diff
+between the pointer that got committed and the actual file contents;
+I would have expected that git would run the smudge/clean filter then and
+not show that diff.)
+"""]]