Closed achilleas-k closed 5 years ago
I think it should be fixed now. A note on what changed with the gin commit
command (pasting from git comment):
Some history:
Now I'm adding it back but the 'git add' is only run for files that match the paths given by the user and are marked as deleted. This should make adding a lot of files faster ('git add' wont be run when adding files) but will still allow for removing files when necessary. The extra 'git annex status' shouldn't be much overhead and will almost certainly be worth the cost. The adding of the deleted files is done before the 'git annex add'. Doing it after leads to errors if git annex adds a deletion and git tries to add it too. This isn't an issue for git annex.
Merge away!
The main change in this PR is that the client no longer runs
git add
aftergit annex add
when preparing a commit. Thegit add
is unnecessary since annex takes care of adding files to git when they match the filter conditions.A smaller change adds information to the output regarding where each file is added (git or annex).