mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

analysis

Browse source
This commit is contained in:
Joey Hess 2018-05-21 12:14:30 -04:00
parent f1aa07d3d4
commit e3c224913e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
doc/bugs/git_proxy_uses_ls-files_without_--exclude-standard/comment_1_81383cf73102346fa8d537e1dde30353._comment Normal file
View file

@ -0,0 +1,41 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2018-05-21T15:46:22Z"
content="""
It wouldn't have actually copied 140 gb of files, unless you're using git-annex
on a filesystem that does not support hard links. If it used hard links,
it would not waste much space while running.
There may be edge cases where, if git-annex proxy did not copy/hard link
ignored files from the work tree to its temporary directory, the proxied
git command would not behave the same as an unproxed git command.
Let's see, such edge cases would have to involve a gitignored file that
is still somehow affected by the proxied git command.
The obvious case is, you have `.*` gitignored, and you run `git annex proxy
-- git add .foo --force` to add the ignored file. If git-annex didn't copy
`.foo`, that would fail, albeit in a fairly obvious way.
Another problem case: You have `.*` gitignored, and you have a local
file `.foo` which is not checked in. You run
`git annex proxy -- git merge branch`, and the branch happens to add
`.foo` with different contents. The merge would normally fail, because
there are conflicting changes in the working tree. If proxy were
changed, the proxied merge would succeed. The local changes in this
case get lost. I've verified that this change causes data loss in this
situation.
So, the current behavior is the safe and right behavior; git-annex should
not lose data by default to optimise for an unusual edge case.
It could be an option, but it would have to be flagged as causing data
loss in some situations involving local modifications to gitignored files,
and causing proxied git behavior to differ from non-proxied git behavior
in other situations. I don't know if the potential benefit is worth the
foot-gun potential.
The code change is very simple if you want to play with it. In
Command/Proxy.hs find the Git.LsFiles line and change "True" to "False".
"""]]