Commit graph

10342 commits

Author SHA1 Message Date
Joey Hess
7e23ce6cef Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-22 16:53:32 -04:00
Joey Hess
450baa02e9 assistant: When built with git before 1.8.0, use git remote rm to delete a remote. Newer git uses git remote remove. 2013-04-22 16:53:09 -04:00
http://joeyh.name/
24b7d59960 Added a comment 2013-04-22 20:43:26 +00:00
Joey Hess
9ca9c1f747 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-22 16:42:09 -04:00
Joey Hess
dc39da52f8 direct, indirect: Refuse to do anything when the assistant or git-annex watch daemon is running. 2013-04-22 16:41:46 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
1c5fb85cb7 Added a comment 2013-04-22 20:38:00 +00:00
Joey Hess
777349f0d3 close; user error 2013-04-22 16:33:12 -04:00
Joey Hess
2c4b6506b4 cannot reproduce; no response after 1 month; close 2013-04-22 16:31:04 -04:00
https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo
9ebfb388f1 2013-04-22 20:24:19 +00:00
Joey Hess
e92a207df5 webapp: When told to add a git repository on a remote server, and the repository already exists as a non-bare repository, use it, rather than initializing a bare repository in the same directory. 2013-04-22 16:21:37 -04:00
Joey Hess
478b14b3c9 tag 2013-04-22 16:11:03 -04:00
Joey Hess
4d730f0398 categorize 2013-04-22 16:09:54 -04:00
Joey Hess
5cd666e645 close 2013-04-22 16:08:42 -04:00
Joey Hess
c5858f2b63 close as duplicate 2013-04-22 16:07:35 -04:00
http://joeyh.name/
a9475a9126 Added a comment 2013-04-22 20:00:12 +00:00
Joey Hess
0138c0bbcd Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-22 15:52:39 -04:00
http://joeyh.name/
b18fc52ef4 Added a comment 2013-04-22 19:48:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkyQL8VPwrSf8LA0k8PKDWFCEKFH3O5Jds
7b02b31b54 2013-04-22 19:47:13 +00:00
Joey Hess
9cb223a8b3 Detect systems that have no user name set in GECOS, and also don't have user.name set in git config, and put in a workaround so that commits to the git-annex branch (and the assistant) will still succeed despite git not liking the system configuration. 2013-04-22 15:36:34 -04:00
http://chiefsucker.com/id/rafael/
bee1bacdff 2013-04-22 19:02:06 +00:00
http://joeyh.name/
af89d0fa9b Added a comment 2013-04-22 18:58:08 +00:00
Joey Hess
8861e270be sync, assistant: Sync with remotes that have annex-ignore set
This is so git remotes on servers without git-annex installed can be used
to keep clients' git repos in sync.

This is a behavior change, but since annex-sync can be set to disable
syncing with a remote, I think it's acceptable.
2013-04-22 14:57:09 -04:00
Joey Hess
b9341fd4c0 handle rpath in OSXMkLibs
Now oberon has some binaries and libraries that use rpath, so I had to put
in this ugly hack to replace the @rapth/lib with the lib in the app.

This was particularly tricky for libraries that use @rpath because I could
not find a way to extract the rpath from the library. (Only from the
executable, by running it.. ugh!) The hack I put in place may fail if
multiple different libraries use rpath to refer to other libraries,
and the "@rpath/lib" string is the same, but actually refers to different
files.
2013-04-22 13:33:29 -04:00
Joey Hess
78868866de Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-22 11:25:16 -04:00
Joey Hess
1579c98d4d fix osx build 2013-04-22 11:24:48 -04:00
140.233.6.178
de4557cead poll vote (/sdcard/annex) 2013-04-22 13:28:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo
c5e35c4005 2013-04-22 10:03:02 +00:00
Richard Hartmann
46d2343d59 Typo 2013-04-22 09:10:16 +02:00
Joey Hess
49d039fe6a Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-21 19:12:05 -04:00
Joey Hess
b6d53c426b blog for the day 2013-04-21 19:11:53 -04:00
Joey Hess
4df9036fa2 got XMPP building for Android
Also enable local pairing, which also builds now thanks to WebDAV
fixes to the haskell network library.
2013-04-21 19:10:23 -04:00
49.176.102.23
dd0532b7c4 poll vote (/sdcard/annex) 2013-04-21 22:59:11 +00:00
84.194.180.65
184a458a12 poll vote (Whole /sdcard) 2013-04-21 20:25:59 +00:00
Joey Hess
8df5be7804 fix build with xmpp enabled but not local pairing 2013-04-21 13:24:56 -04:00
212.255.225.202
ac74ab2c2a poll vote (/sdcard/annex) 2013-04-21 16:35:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
8d34639b54 new forum post 2013-04-21 03:33:02 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
4b04a835a9 poll vote (/sdcard/annex) 2013-04-21 03:09:20 +00:00
Joey Hess
accf949f9c change section 2013-04-20 20:24:57 -04:00
Joey Hess
984bc8570d improve usage messages 2013-04-20 20:23:11 -04:00
Joey Hess
54e7cdb55c close poll 2013-04-20 19:40:48 -04:00
http://joeyh.name/
26388c453b Added a comment 2013-04-20 23:38:48 +00:00
Joey Hess
5faedad2d6 recent change broke this 2013-04-20 19:35:33 -04:00
Joey Hess
cefe2fac2d Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-20 19:29:26 -04:00
Joey Hess
a24a471ea9 blog for the day 2013-04-20 19:28:46 -04:00
Joey Hess
580f22f45d forgot to commit this new file 2013-04-20 19:27:36 -04:00
Joey Hess
844e772910 fix warnings 2013-04-20 19:25:50 -04:00
Joey Hess
70e251547e fix menu file installation directory 2013-04-20 19:02:14 -04:00
Joey Hess
4ddf9b7467 webapp: Don't default to making repository in cwd when started from within a directory containing a git-annex file (eg, standalone tarball directory). 2013-04-20 18:53:04 -04:00
Joey Hess
780ed8ebf1 fix warning 2013-04-20 18:52:46 -04:00
Joey Hess
d2e92e2494 Install FDO desktop menu file when webapp is started in standalone mode. 2013-04-20 18:48:05 -04:00