Commit graph

2854 commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo
910886e82b Added a comment 2013-08-08 12:22:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
6ab970f357 Added a comment 2013-08-08 08:33:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
4cbbad2e71 removed 2013-08-08 08:29:34 +00:00
konubinix
0517f9d011 Added a comment: Git annexed files symlink are wrong when submodule is not in the same path 2013-08-08 06:36:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
f872dd4cef Added a comment 2013-08-07 22:33:50 +00:00
Joey Hess
9e7fe53050 close 2013-08-07 12:32:53 -04:00
Joey Hess
232abe89de Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-07 12:26:24 -04:00
http://www.rfc1149.net/
098e622164 Added a comment: Indeed 2013-08-07 16:17:42 +00:00
Joey Hess
986f98462e remove duplicate bug report. I had a complaint this filename was too long for some (non-Microsoft!) OS that has filename length issues 2013-08-07 12:14:47 -04:00
http://joeyh.name/
5507fc8361 Added a comment 2013-08-07 16:13:31 +00:00
http://joeyh.name/
853058f4ea Added a comment 2013-08-07 16:07:57 +00:00
Joey Hess
bb3fd04f6f Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-07 12:02:47 -04:00
Joey Hess
a5ee4df40a make Feeds show in features list 2013-08-07 12:02:12 -04:00
http://joeyh.name/
a88d30c218 Added a comment 2013-08-07 15:59:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
a9d5d4511a 2013-08-07 14:16:32 +00:00
http://grossmeier.net/
632219ff40 "Feeds" not a listed build flag 2013-08-06 21:50:14 +00:00
chrisbra
e1630f4e20 Added a comment: sorry, added some wrapping signs from vim. 2013-08-06 18:01:40 +00:00
chrisbra
90b467b33f 2013-08-06 18:00:59 +00:00
Joey Hess
47a69b6433 already fixed 2013-08-06 13:35:42 -04:00
arand
ca60a6137e 2013-08-06 17:14:37 +00:00
http://www.rfc1149.net/
3b5a273613 2013-08-06 09:01:32 +00:00
http://jamdev.myopenid.com/
a61b015b83 Git-annex broken on Android v4.3 2013-08-04 16:22:15 +00:00
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
http://arthur.lutz.im/
f41d640f3c bug report 2013-07-29 13:06:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
2ed2e2d662 Added a comment: .git/annex/webapp.html 2013-07-29 12:08:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY
8afeb0e86d Added a comment: Having trouble reproducing 2013-07-29 11:14:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnrFnHRRNUQBB5RCDaIwhVmCcxQp8_yiYw
cf6103961a 2013-07-29 11:07:47 +00:00
https://lorrin.myopenid.com/
1647361bc8 Added a comment: Still seeing this 2013-07-29 07:44:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawknruiCHUcOh2mmpkh7OFJ4iNfAOOamRVs
0797f16248 2013-07-29 01:52:44 +00:00
marvin
17eabeebf2 Added a comment: Comfirm 2013-07-28 19:42:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0
4a18b249d3 Added a comment: Yes it does 2013-07-28 12:04:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0
91769a8e33 Added a comment 2013-07-28 11:46:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0
2030da1478 Added a comment: Not completely... 2013-07-28 11:44:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0
b4937d1a62 Added a comment 2013-07-28 11:21:42 +00:00
http://bigasterisk.com/
01956caf8e Added a comment 2013-07-28 05:36:39 +00:00
http://edheil.wordpress.com/
a54c11c40d Added a comment 2013-07-28 05:29:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl-BU4KfFktO2-bqaFmlArHta0Oy7zJrCs
254c181590 2013-07-28 05:14:09 +00:00
Joey Hess
55bd5a81ad Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-27 20:56:19 -04:00
Joey Hess
ea0dd46331 merge 2013-07-27 20:29:23 -04:00
http://joeyh.name/
b37d859efb Added a comment 2013-07-28 00:27:28 +00:00
http://joeyh.name/
54e18f99fb Added a comment 2013-07-28 00:23:08 +00:00
Joey Hess
94edbd5f6e title 2013-07-27 20:07:49 -04:00
http://joeyh.name/
e61b6ca2ea Added a comment 2013-07-28 00:06:53 +00:00
http://joeyh.name/
7f67bfcb34 Added a comment 2013-07-27 23:51:38 +00:00
Joey Hess
9b042412b6 close 2013-07-27 19:07:24 -04:00
http://joeyh.name/
aa9f84c748 Added a comment 2013-07-27 22:40:58 +00:00
http://joeyh.name/
117fe44f08 Added a comment 2013-07-27 22:39:12 +00:00
http://joeyh.name/
389467fa0d Added a comment: I can't reproduce this problem, but I see several people have reported it. 2013-07-27 22:11:16 +00:00
Joey Hess
97beb92f2a merge 2013-07-27 18:08:33 -04:00
Joey Hess
a23dca1b31 I meant to close this before 2013-07-27 18:03:29 -04:00
Joey Hess
30b9984188 moreinfo 2013-07-27 18:02:19 -04:00
Joey Hess
d6c75dc7d4 title 2013-07-27 18:01:06 -04:00
http://joeyh.name/
03d86d5e7d Added a comment 2013-07-27 21:50:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0
14e4e9396b Added a comment: Will give the new version a got tomorrow... 2013-07-27 21:45:29 +00:00
http://joeyh.name/
5675fe1c91 Added a comment 2013-07-27 20:46:02 +00:00
Joey Hess
9fb6d7263b Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-27 16:07:38 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmhGq_ii5HaDkp9nx2m9qIMe-xxI4HV5wo
8024263e3c Added a comment 2013-07-27 20:05:57 +00:00
Joey Hess
f4f2eefe79 close 2013-07-27 15:56:37 -04:00
http://joeyh.name/
a5467fe74d Added a comment 2013-07-27 19:55:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmhGq_ii5HaDkp9nx2m9qIMe-xxI4HV5wo
009045fb67 2013-07-27 19:50:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmhGq_ii5HaDkp9nx2m9qIMe-xxI4HV5wo
49b9badca5 2013-07-27 19:48:49 +00:00
http://joeyh.name/
c830a1d6f4 Added a comment 2013-07-27 17:46:11 +00:00
http://joeyh.name/
fd8a44f218 Added a comment 2013-07-27 17:37:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0
e71e020fcc Added a comment: Replicated, I think 2013-07-27 10:02:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0
9399845b77 Added a comment 2013-07-27 08:14:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0
ae807604f3 Added a comment: git annex uninit does this too... 2013-07-27 07:55:49 +00:00
http://bigasterisk.com/
7916a237aa Added a comment 2013-07-27 07:42:26 +00:00
http://edheil.wordpress.com/
1465c456fd Added a comment 2013-07-27 06:03:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkiAsTXFXZbLE8iyy6yDtvz4MPFbzsk3c0
6bae19a10e Added a comment: thanks! 2013-07-27 05:33:34 +00:00
Joey Hess
4c6bccd5c8 Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-26 19:53:54 -04:00
http://adamspiers.myopenid.com/
c1b683546c Added a comment: I just reproduced this 2013-07-26 23:37:26 +00:00
http://mey.vn/
18c1040f97 Added a comment 2013-07-26 22:38:51 +00:00
http://mey.vn/
67afa0a445 Added a comment 2013-07-26 22:31:15 +00:00
Joey Hess
de066200f3 retitle 2013-07-26 18:29:46 -04:00
http://joeyh.name/
8a6f5221c4 Added a comment 2013-07-26 22:28:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0
c0ede70a4b Added a comment: Ooops 2013-07-26 21:28:46 +00:00
http://joeyh.name/
c40bd5a711 Added a comment 2013-07-26 21:09:36 +00:00
http://joeyh.name/
3b67adb2fc Added a comment 2013-07-26 21:08:02 +00:00
Joey Hess
5645003f70 Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-26 17:02:12 -04:00
http://joeyh.name/
114fa5a27d Added a comment 2013-07-26 20:59:43 +00:00
Joey Hess
97f3aecb17 assistant: Fix NetWatcher to not sync with remotes that have remote.<name>.annex-sync set to false.
This affected both the hourly NetWatcherFallback thread and the syncing
when network connection is detected.

It was a reversion of sorts, introduced in
8861e270be, when annex-ignore was changed to
not control git syncing. I forgot to make it check annex-sync at that
point.
2013-07-26 16:54:20 -04:00
http://mey.vn/
0dd5ae5904 removed 2013-07-26 19:44:25 +00:00
http://mey.vn/
1231100451 removed 2013-07-26 19:43:28 +00:00
http://mey.vn/
17ad7bc477 Added a comment 2013-07-26 18:11:25 +00:00
http://mey.vn/
bb2127a42f Added a comment 2013-07-26 17:24:15 +00:00
http://mey.vn/
cd48222a2f Added a comment 2013-07-26 17:23:54 +00:00
http://joeyh.name/
f0b67fba6e Added a comment 2013-07-26 16:55:09 +00:00
http://joeyh.name/
71fdefbf7d Added a comment 2013-07-26 16:52:26 +00:00
http://mey.vn/
a403fb0928 Added a comment 2013-07-26 14:54:23 +00:00
http://bigasterisk.com/
e8b1923de9 Added a comment: ~/annex/.git/config files (after running the steps above) 2013-07-26 13:20:29 +00:00
http://jamdev.myopenid.com/
1542def638 Added a comment: well that was fast! 2013-07-25 21:01:38 +00:00
http://joeyh.name/
3194701c05 Added a comment 2013-07-25 20:12:06 +00:00
http://joeyh.name/
4c797763d9 Added a comment 2013-07-25 20:02:18 +00:00
Joey Hess
c6b99fef62 fixed 2013-07-25 15:45:10 -04:00
Joey Hess
f38074f307 not a bug 2013-07-25 14:37:02 -04:00
Joey Hess
15166111b2 close 2013-07-25 14:24:45 -04:00
Joey Hess
a34c36d7fe Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-25 14:03:07 -04:00
Joey Hess
fc1a79835b Always build with -threaded, to avoid a deadlock when communicating with gpg. 2013-07-25 13:57:53 -04:00
http://joeyh.name/
bff02542ea Added a comment 2013-07-25 17:57:31 +00:00
http://joeyh.name/
5d33ae4d98 Added a comment 2013-07-25 17:44:59 +00:00
http://joeyh.name/
976c334a7e Added a comment 2013-07-25 17:38:39 +00:00