Commit graph

2932 commits

Author SHA1 Message Date
http://joeyh.name/
e35656f942 Added a comment 2013-08-03 20:15:18 +00:00
http://joeyh.name/
59fcb2eaa2 2013-08-03 20:09:06 +00:00
Joey Hess
b191d5c595 gitignore support for the assistant and watcher
Requires git 1.8.4 or newer. When it's installed, a background
git check-ignore process is run, and used to efficiently check ignores
whenever a new file is added.

Thanks to Adam Spiers, for getting the necessary support into git for this.

A complication is what to do about files that are gitignored but have
been checked into git anyway. git commands assume the ignore has been
overridden in this case, and not need any more overriding to commit a
changed version.

However, for the assistant to do the same, it would have to run git ls-files
to check if the ignored file is in git. This is somewhat expensive. Or it
could use the running git-cat-file process to query the file that way,
but that requires transferring the whole file content over a pipe, so it
can be quite expensive too, for files that are not git-annex
symlinks.

Now imagine if the user knows that a file or directory tree will be getting
frequent changes, and doesn't want the assistant to sync it, so gitignores
it. The assistant could overload the system with repeated ls-files checks!

So, I've decided that the assistant will not automatically commit changes
to files that are gitignored. This is a tradeoff. Hopefully it won't be a
problem to adjust .gitignore settings to not ignore files you want the
assistant to autocommit, or to manually git annex add files that are listed
in .gitignore.

(This could be revisited if git-annex gets access to an interface to check
the content of the index w/o forking a git command. This could be libgit2,
or perhaps a separate git cat-file --batch-check process, so it wouldn't
need to ship over the whole file content.)

This commit was sponsored by Francois Marier. Thanks!
2013-08-02 20:37:03 -04:00
Richard Hartmann
24cd572a7c Sometimes, I dislike MarkDown 2013-08-02 09:02:45 +02:00
Richard Hartmann
4bd5b920c7 Fix indentation 2013-08-02 08:59:30 +02:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
e98d1d6ac1 Added a comment 2013-08-02 06:57:13 +00:00
Joey Hess
12e269482f Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-31 16:48:41 -04:00
Joey Hess
88b1a3e54e close 2013-07-31 16:48:35 -04:00
http://joeyh.name/
166128760d Added a comment 2013-07-31 20:42:10 +00:00
http://joeyh.name/
5824b13546 Added a comment: workaround 2013-07-31 17:19:01 +00:00
http://joeyh.name/
2ae68bc9e2 Added a comment: finally! 2013-07-31 16:47:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0
94c23aaf25 Added a comment 2013-07-31 14:17:19 +00:00
Remy
6d372d5e31 Added a comment 2013-07-31 13:55:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY
2f4872e496 Added a comment: seems to work 2013-07-31 09:37:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawknruiCHUcOh2mmpkh7OFJ4iNfAOOamRVs
8d977ed697 Added a comment 2013-07-31 05:34:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
5ac4bae331 Added a comment: /storage/sdcard1/.git/annex/daemon.log 2013-07-30 23:11:29 +00:00
http://joeyh.name/
af7caeb27d Added a comment 2013-07-30 21:12:54 +00:00
http://joeyh.name/
03017896b7 Added a comment: fixed 2013-07-30 20:11:19 +00:00
Joey Hess
0545c960a7 Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-30 16:08:43 -04:00
Joey Hess
7b0970b340 Fix inverted logic in last release's fix for data loss bug, that caused git-annex sync on FAT or other crippled filesystems to add symlink standin files to the annex. 2013-07-30 16:08:09 -04:00
http://joeyh.name/
5474f655ee Added a comment 2013-07-30 20:07:09 +00:00
http://joeyh.name/
fc781a8650 Added a comment 2013-07-30 19:55:04 +00:00
http://joeyh.name/
3c8a804df7 Added a comment: re: workaround 2013-07-30 19:17:11 +00:00
Joey Hess
a8475e18c9 Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-30 15:15:48 -04:00
Joey Hess
f55dc1b64f OSX: Make git-annex-webapp run in the background, so that the app icon can be clicked on the open a new webapp when the assistant is already running. 2013-07-30 15:04:31 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
d4a6ea3c26 Added a comment: log file 2013-07-30 19:03:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0
ede12f3456 Added a comment 2013-07-30 19:01:32 +00:00
http://joeyh.name/
c562377ce5 Added a comment 2013-07-30 19:00:44 +00:00
http://joeyh.name/
647fc7ef7c Added a comment 2013-07-30 18:51:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl-BU4KfFktO2-bqaFmlArHta0Oy7zJrCs
e3390d795d Added a comment 2013-07-30 18:44:00 +00:00
http://joeyh.name/
1995e8a8a0 Added a comment 2013-07-30 18:42:32 +00:00
Joey Hess
66b470c03d close 2013-07-30 14:40:16 -04:00
http://joeyh.name/
a04ac0e73d Added a comment 2013-07-30 18:39:58 +00:00
Joey Hess
9f77e68a4e close 2013-07-30 14:38:25 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
3dd3e1c403 2013-07-30 18:20:08 +00:00
Joey Hess
6ac595f8b5 update test suite for dropunused behavior change 2013-07-30 14:17:09 -04:00
http://joeyh.name/
ca66fa4f12 Added a comment 2013-07-30 18:16:07 +00:00
http://joeyh.name/
87c1b8bb1c Added a comment 2013-07-30 18:06:05 +00:00
http://joeyh.name/
e621bc07be Added a comment 2013-07-30 17:40:04 +00:00
http://joeyh.name/
e9c48cf7c0 Added a comment 2013-07-30 17:31:53 +00:00
http://joeyh.name/
e91438b281 Added a comment 2013-07-30 17:18:15 +00:00
http://joeyh.name/
052daee188 Added a comment 2013-07-30 16:59:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
b07559e3c4 2013-07-30 15:03:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
b84f1c1a3c 2013-07-30 15:01:38 +00:00
ckeen
b98170fc20 Added a comment: Maybe related to this bug? 2013-07-30 14:50:36 +00:00
Johannes
e19607db17 Added a comment 2013-07-30 11:34:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
3d265ae028 Added a comment 2013-07-29 23:49:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
1d1a87e442 2013-07-29 23:47:00 +00:00
https://launchpad.net/~subito
2c3a28e30f Added a comment: Same here for SSH remotes 2013-07-29 19:05:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl-BU4KfFktO2-bqaFmlArHta0Oy7zJrCs
a6d39a612b Added a comment: Thanks! 2013-07-29 14:44:43 +00:00