Commit graph

8720 commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawlzlNQbf6wBgv9j6-UqfpXcQyAYMF8S3t4
436c0afff6 2013-08-03 11:45:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlzlNQbf6wBgv9j6-UqfpXcQyAYMF8S3t4
24674f7767 2013-08-03 11:44:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlXEIT2PEAuHuInLP4UYVzWE0lceMYd2lA
3d25893744 Added a comment: Installation on tonidoplug 2013-08-03 07:19:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
91bd062b91 Added a comment 2013-08-03 07:12:44 +00:00
Joey Hess
17f05d6572 blog for the day 2013-08-02 20:38:57 -04: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
Joey Hess
1452ac38aa release notes 2013-08-02 13:41:28 -04:00
Joey Hess
61a327cf93 add news item for git-annex 4.20130802 2013-08-02 13:39:43 -04:00
Joey Hess
022c3910e9 Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-02 11:36:39 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
f946fd31c9 Added a comment: re: git annex get failed -- debug 2013-08-02 15:28:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
c6d7b05a48 Added a comment: re: git annex get failed 2013-08-02 15:02:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
1ddb25cadb Added a comment: git annex get failed 2013-08-02 14:29:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
7a566a332f 2013-08-02 13:41:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
60ecabd8ba Added a comment 2013-08-02 07:21:50 +00: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
http://joeyh.name/
c88bbc47ce Added a comment 2013-08-01 23:51:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnWvnTWY6LrcPB4BzYEBn5mRTpNhg5EtEg
0bb455dcae Added a comment: checkpresent again 2013-08-01 23:18:38 +00:00
Joey Hess
e6123b0187 reorder 2013-08-01 17:57:53 -04:00
Joey Hess
bb74db6ef0 blog for the day 2013-08-01 17:33:04 -04:00
Joey Hess
4e6f498cb8 update 2013-08-01 15:25:47 -04:00
http://joeyh.name/
ebef73985e Added a comment 2013-08-01 17:10:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln4uCaqZRd5_nRQ-iLcJyGctIdw8ebUiM
4f7bfbb2ec Added a comment: Thanks 2013-08-01 17:03:23 +00:00
http://joeyh.name/
53b77590d7 Added a comment 2013-08-01 16:58:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln4uCaqZRd5_nRQ-iLcJyGctIdw8ebUiM
5a0e741a44 Added a comment: Just put multiple source files 2013-08-01 16:29:07 +00:00
http://joeyh.name/
aa337f990c Added a comment 2013-08-01 16:06:42 +00:00
http://joeyh.name/
7e06571454 Added a comment 2013-08-01 16:05:10 +00:00
Joey Hess
904f776a2f Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-01 12:03:48 -04:00
Joey Hess
03c76b5a30 improve importfeed --force; try to match existing files to avoid unncessary duplication 2013-08-01 11:57:05 -04:00
ckeen
4973b8c9db Added a comment: --force reload all URLs 2013-08-01 09:47:35 +00:00
https://launchpad.net/~mikapflueger
b640a5941b Added a comment: Thank you so much! 2013-08-01 01:13:53 +00:00
Richard Hartmann
0afe0273cb Typo 2013-08-01 01:16:27 +02:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
febb7a8299 2013-07-31 22:39:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln4uCaqZRd5_nRQ-iLcJyGctIdw8ebUiM
d40343f7a5 2013-07-31 22:19:22 +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
Joey Hess
3a1e458e0a blog for the day 2013-07-31 16:47:30 -04:00
http://joeyh.name/
166128760d Added a comment 2013-07-31 20:42:10 +00:00
http://joeyh.name/
890bf1a750 Added a comment 2013-07-31 20:03:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
9545d3420c Added a comment: Horns? 2013-07-31 19:53:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
209a0ca0fa removed 2013-07-31 19:53:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
3cce0d51e6 Added a comment: Horns? 2013-07-31 19:52:42 +00:00
http://joeyh.name/
fea51d053c Added a comment 2013-07-31 17:42:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnWvnTWY6LrcPB4BzYEBn5mRTpNhg5EtEg
17bc95cb2f Added a comment 2013-07-31 17:34:50 +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
Joey Hess
78abed22ae Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-31 12:32:32 -04:00
Joey Hess
5af1190ef1 make edits that a commenter apparently didn't realize they could make. this is a wiki.. 2013-07-31 12:31:30 -04:00
http://joeyh.name/
f9c8ee9bc8 Added a comment 2013-07-31 16:25:55 +00:00