mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
20190 commits 13 branches 445 tags 110 MiB
Commit graph

4918 commits

Author SHA1 Message Date
Joey Hess
e8b4eb0cdb Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-16 11:33:00 -04:00
Joey Hess
501cc8623a assistant: Fix one-way assistant->assistant sync in direct mode. 
When in direct mode, update the master branch after committing to the
annex/direct/master branch. Also, update the synced/master branch.

This fixes a topology A->B where both A and B are in direct mode and
running the assistant, and a change is made to B. Before this fix, A pulled
the changes from B, but since they were only on the annex/direct/master
branch, it did not merge them.

Note that I considered making the assistant merge the
remotes/B/annex/direct/master, but decided to keep it simple and only merge
the sync branches as before.
 2014-06-16 11:32:13 -04:00
http://joeyh.name/
a78636e78a Added a comment 2014-06-16 15:10:42 +00:00
http://joeyh.name/
1dadac2390 Added a comment 2014-06-13 18:35:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmXSkgjC_ypUQafVwvHTLsStrkiXH8CfHU
36ef4663af Added a comment 2014-06-13 18:30:25 +00:00
http://joeyh.name/
e9d411d0a6 2014-06-13 14:53:23 +00:00
Joey Hess
b30de0dfd2 work around a bug in git 
http://marc.info/?l=git&m=140262402204212&w=2

This git bug manifested on FAT and Windows as the test suite failing in 3
places. All involved merge conflict resolution. It turned out that the
associated file mappings were getting messed up, and that happened because
this git bug lost track of what files were supposed to be symlinks.

This commit was sponsored by Eric Kidd.
 2014-06-12 22:00:02 -04:00
http://joeyh.name/
c1ceafeef3 Added a comment 2014-06-12 20:07:30 +00:00
Joey Hess
9a001211a5 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-12 15:52:48 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmXSkgjC_ypUQafVwvHTLsStrkiXH8CfHU
e4c4966231 2014-06-12 19:31:51 +00:00
Joey Hess
b291951180 merge in windows loststamp branch 2014-06-12 15:21:10 -04:00
Joey Hess
9dd380cf3b this just went from horrible to insanely weird 2014-06-12 15:17:32 -04:00
Joey Hess
4fe2e53f5b finish fixing windows timezone madness 
Rather than calculating the TSDelta once, and caching it, this now
reads the inode sential file's InodeCache file once, and then each time a
new InodeCache is generated, looks at the sentinal file to get the current
delta.

This way, if the time zone changes while git-annex is running, it will
adapt.

This adds some inneffiency, but only on Windows, and only 1 stat per new
file added. The worst innefficiency is that `git annex status` and
`git annex sync` will now (on Windows) stat the inode sentinal file once per
file in the repo.

It would be more efficient to use getCurrentTimeZone, rather than needing
to stat the sentinal file. This should be easy to do, once the time
package gets my bugfix patch.

This commit was sponsored by Jürgen Lüters.
 2014-06-12 13:54:08 -04:00
martin
aaf8045e56 Added a comment: In reply to comment 11 2014-06-12 09:22:54 +00:00
Joey Hess
3ee75d8738 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-11 19:07:26 -04:00
http://joeyh.name/
4b525889f1 Added a comment 2014-06-11 23:02:28 +00:00
http://joeyh.name/
2cc8a53815 Added a comment 2014-06-11 22:54:48 +00:00
Joey Hess
0c40bf5a94 confirmed 2014-06-11 18:20:58 -04:00
http://joeyh.name/
e48a363c30 Added a comment 2014-06-11 22:11:39 +00:00
http://joeyh.name/
fee38c834b Added a comment 2014-06-11 20:09:14 +00:00
http://joeyh.name/
c09a2e9f0f Added a comment 2014-06-11 19:51:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
aaf6b64255 Added a comment 2014-06-11 19:47:35 +00:00
http://joeyh.name/
398640f35e Added a comment 2014-06-11 19:09:17 +00:00
http://joeyh.name/
764340e7a2 Added a comment 2014-06-11 18:59:49 +00:00
Joey Hess
1c18056e15 deal with FAT on Linux timestamp issue 
Deal with FAT's low resolution timestamps, which in combination with
Linux's caching of higher res timestamps while a FAT is mounted, caused
direct mode repositories on FAT to seem to have modified files after they
were unmounted and remounted.

This commit was sponsored by Fabrice Rossi.
 2014-06-11 14:46:03 -04:00
Joey Hess
d7ef984999 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-11 14:40:36 -04:00
Joey Hess
73aa19a0dc split out bug report from FAT:_Date_resolution_for_mtime_2s--__62___implications 2014-06-11 14:32:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV4
f137ab8144 Added a comment 2014-06-11 18:29:38 +00:00
http://joeyh.name/
e2186a46ce Added a comment: FAT MetaData Sucks: an approach 2014-06-11 18:15:59 +00:00
http://joeyh.name/
18ac339ef6 Added a comment 2014-06-11 18:05:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
420fedc193 Added a comment: No git-annex process. 2014-06-11 17:55:56 +00:00
http://joeyh.name/
b35d3afed5 Added a comment 2014-06-11 17:22:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmi0jblSiI4c5-EswqKw4PXkx5M4fuVvdk
4631074747 Added a comment 2014-06-11 16:31:09 +00:00
martin
b0b2e52bbf Added a comment: specification 2014-06-11 05:43:02 +00:00
http://joeyh.name/
3614706fd6 Added a comment 2014-06-10 19:31:38 +00:00
http://joeyh.name/
f7baa697e7 Added a comment 2014-06-10 19:27:55 +00:00
martin
9ece87c421 Added a comment: git-annex add (called by sync) should do the job and bring the files back home (IMHO) 2014-06-10 15:58:25 +00:00
Joey Hess
2dfbbc6b43 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-09 19:47:31 -04:00
Joey Hess
d6711800ad avoid bad commits after interrupted direct mode sync (or merge) 
It was possible for a interrupted sync or merge in direct mode to
leave the work tree out of sync with the last recorded commit.
This would result in the next commit seeing files missing from the work
tree, and committing their removal.

Now, a direct mode merge happens not only in a throwaway work tree, but using
a temporary index file, and without any commits or index changes
being made until the real work tree has been updated. If the merge is
interrupted, the work tree may have some updated files, but worst case a
commit will redundantly commit changes that come from the merge.

This commit was sponsored by Tony Cantor.
 2014-06-09 19:40:28 -04:00
Joey Hess
193e702d73 harder 2014-06-09 17:43:49 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
b36bad94a1 Added a comment 2014-06-09 21:16:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
fe4eb0517d Added a comment 2014-06-09 20:34:55 +00:00
Joey Hess
920794ab6b bug 2014-06-09 15:43:52 -04:00
Joey Hess
70a00802a6 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-09 15:32:24 -04:00
http://joeyh.name/
49cc5e1594 Added a comment 2014-06-09 19:29:09 +00:00
Joey Hess
7671d228af Avoid leaving behind .tmp files when failing in some cases, including importing files to a disk that is full. 2014-06-09 15:24:05 -04:00
Joey Hess
24915adab7 tagging 2014-06-09 15:09:03 -04:00
http://joeyh.name/
f50e8acb99 Added a comment 2014-06-09 18:57:25 +00:00
http://joeyh.name/
7dd162ba1f Added a comment 2014-06-09 18:46:01 +00:00
Joey Hess
787d9e27ba Ignore setsid failures. 2014-06-09 14:44:18 -04:00
Joey Hess
b6274745b4 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-09 14:43:49 -04:00
Joey Hess
1d4ba328e5 close; forwarded 2014-06-09 13:40:29 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
4b270fda85 Describe bug. 2014-06-08 12:54:27 +00:00
martin
f476e96e43 Added a comment: use case and answer to joey's question "...then when..." 2014-06-08 04:59:42 +00:00
EskildHustvedt
15f043b20c Added a comment 2014-06-07 05:47:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA
f490015d6c Added a comment: a different fix 2014-06-07 04:27:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
9600e79f76 2014-06-06 22:42:03 +00:00
http://joeyh.name/
602499771b Added a comment 2014-06-06 16:53:21 +00:00
EskildHustvedt
48793b6cec Added a comment 2014-06-06 16:13:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA
b8717938d1 2014-06-06 11:02:35 +00:00
Joey Hess
ded79929bc Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-05 15:55:01 -04:00
martin
5d8f87e530 Added a comment: another scenario 2014-06-05 19:52:05 +00:00
Joey Hess
a0c8b8493c Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-05 15:35:33 -04:00
Joey Hess
eb86f1338f wip 2014-06-05 15:31:23 -04:00
http://joeyh.name/
84596620a6 Added a comment 2014-06-05 19:20:20 +00:00
http://joeyh.name/
9235c146fb Added a comment 2014-06-05 19:06:36 +00:00
martin
af1f0fdd5c Added a comment: It confuses users 2014-06-05 19:05:12 +00:00
Joey Hess
cafe82b542 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-05 14:59:25 -04:00
http://joeyh.name/
ef18a3a2e6 Added a comment 2014-06-05 18:29:15 +00:00
Joey Hess
d69c78483c confirmed 2014-06-05 13:37:26 -04:00
http://joeyh.name/
39baba0cd2 Added a comment 2014-06-05 17:37:08 +00:00
https://launchpad.net/~eliasson
ab9f45f2dc Added a comment 2014-06-05 17:15:32 +00:00
http://joeyh.name/
11f4218682 Added a comment 2014-06-05 17:06:40 +00:00
jamieson
67f531cd1f Added a comment 2014-06-05 16:56:33 +00:00
http://joeyh.name/
bc45f680c9 Added a comment 2014-06-05 16:51:42 +00:00
http://joeyh.name/
b7cbb7d227 Added a comment 2014-06-05 16:50:30 +00:00
jamieson
64507e07eb Added a comment 2014-06-05 16:50:20 +00:00
http://joeyh.name/
81202e2360 Added a comment 2014-06-05 16:37:27 +00:00
Joey Hess
022fb1f45d dup 2014-06-05 12:25:06 -04:00
modules
8551998306 removed 2014-06-05 11:24:40 +00:00
modules
0ce5861618 2014-06-05 10:55:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA
63859347f3 2014-06-05 10:21:13 +00:00
Joey Hess
6ba5df201e Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-04 14:37:20 -04:00
http://joeyh.name/
575ae39bea Added a comment 2014-06-04 18:14:19 +00:00
http://joeyh.name/
4111c4a4f6 Added a comment 2014-06-04 18:08:39 +00:00
Joey Hess
ee63c59644 close; dup of fixed bug 2014-06-04 14:07:30 -04:00
http://joeyh.name/
5e56e1da13 Added a comment 2014-06-04 18:07:11 +00:00
https://svario.it/gioele
bace3004fc 2014-06-04 07:09:01 +00:00
https://id.koumbit.net/anarcat
0d30687bfe Added a comment 2014-06-04 04:53:36 +00:00
gjost
cee91dca22 2014-06-03 20:22:30 +00:00
gjost
acff2b7392 2014-06-03 20:20:33 +00:00
gjost
626c07da35 removed 2014-06-03 20:18:40 +00:00
gjost
31c038da2a 2014-06-03 20:17:56 +00:00
https://launchpad.net/~eliasson
052833c678 2014-06-02 21:45:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkPSASwemBzccJmjkotESlbUSs5GPFiPCs
0f5fd737c5 Added a comment: Ok, but ? 2014-06-02 18:22:24 +00:00
http://joeyh.name/
9cffbb6503 Added a comment 2014-06-02 16:28:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkPSASwemBzccJmjkotESlbUSs5GPFiPCs
e63e8b6662 2014-06-01 13:25:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkPSASwemBzccJmjkotESlbUSs5GPFiPCs
d978ec01cb 2014-06-01 13:24:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawniXLhO9mLn-7EDfawdENZ2fQwlGy5w_oc
169404e294 Added a comment: Update - 20140529 2014-06-01 01:36:16 +00:00
Jamieson
4dc4190f17 minor bugs found with SSH on port != 22 2014-05-31 17:32:22 +00:00