Commit graph

20185 commits

Author SHA1 Message Date
Joey Hess
7e5ff2b0d6
Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-04 13:49:44 -04:00
Joey Hess
1c1f463c3a
avoid using --no-gpg-sign with old versions of git
and refactor some
2014-07-04 13:49:12 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
15e151726a Added a comment 2014-07-04 16:25:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
6a62713b20 removed 2014-07-04 16:25:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
fff29ecc2d Added a comment 2014-07-04 16:23:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
4a1324fc85 removed 2014-07-04 16:22:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
cc46318cfd Added a comment 2014-07-04 16:21:36 +00:00
Joey Hess
fc67925fd7
reorg
avoid Git.Command needing Utility.Batch which needs async

For github-backup etc
2014-07-04 12:18:49 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmM6DfQEsnM9atNrdbmj3ql9QUOALLFd2c
1f3ffcc0b0 2014-07-04 16:09:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmM6DfQEsnM9atNrdbmj3ql9QUOALLFd2c
1815e3c50c 2014-07-04 16:07:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmM6DfQEsnM9atNrdbmj3ql9QUOALLFd2c
1d7964024f 2014-07-04 16:05:59 +00:00
Joey Hess
ad7325a828
Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-04 11:55:12 -04:00
Joey Hess
d41849bc23
support commit.gpgsign
Support users who have set commit.gpgsign, by disabling gpg signatures for
git-annex branch commits and commits made by the assistant.

The thinking here is that a user sets commit.gpgsign intending the commits
that they manually initiate to be gpg signed. But not commits made in the
background, whether by a deamon or implicitly to the git-annex branch.
gpg signing those would be at best a waste of CPU and at worst would fail,
or flood the user with gpg passphrase prompts, or put their signature on
changes they did not directly do.

See Debian bug #753720.

Also makes all commits done by git-annex go through a few central control
points, to make such changes easier in future.

Also disables commit.gpgsign in the test suite.

This commit was sponsored by Antoine Boegli.
2014-07-04 11:53:51 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
73b16289c1 2014-07-04 15:36:21 +00:00
Joey Hess
cb48baed33 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-04 01:13:31 -04:00
Joey Hess
08a737c3df
deal with android SDK change
No longer has android-17 target, now it's android-18.
2014-07-04 01:12:13 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmlO6w9_FAVe3v6MdnkePxaTJqp0RPbGhM
1831b56b21 Added a comment 2014-07-04 04:00:25 +00:00
Joey Hess
c4e718d1f5
missing import 2014-07-03 19:49:26 -04:00
Joey Hess
36fc1b84d7 Merge orca:/tmp/build 2014-07-03 19:46:27 -04:00
Joey Hess
995cb05408 update android haskell patches 2014-07-04 00:47:49 +01:00
Joey Hess
3867c3d3bc Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-03 16:41:13 -04:00
Joey Hess
386f71a3b3
devblog 2014-07-03 16:35:08 -04:00
http://joeyh.name/
9a1f130294 Added a comment 2014-07-03 20:13:57 +00:00
cbaines
5dd552f5a4 Added a comment 2014-07-03 20:13:20 +00:00
Joey Hess
63af52b17f close as dup 2014-07-03 16:12:19 -04:00
http://joeyh.name/
6e3a298029 Added a comment 2014-07-03 20:10:41 +00:00
Joey Hess
03b40d6e4c Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-03 16:03:28 -04:00
Joey Hess
ecddaffd3e Android: patch git to avoid fchmod, which fails on /sdcard. 2014-07-03 16:02:42 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnxFr-i4nNUVrj3PJ_JKhp7GtZ5Xom7-3w
4c2668b17f Added a comment: Errors from Screenshots 2014-07-03 20:00:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxFr-i4nNUVrj3PJ_JKhp7GtZ5Xom7-3w
a40a9815da removed 2014-07-03 19:58:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxFr-i4nNUVrj3PJ_JKhp7GtZ5Xom7-3w
02ded1ad56 Added a comment: Errors from Screenshots 2014-07-03 19:56:58 +00:00
http://joeyh.name/
3df06844c9 Added a comment 2014-07-03 19:49:03 +00:00
Joey Hess
7f78404a9d Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-03 15:45:15 -04:00
Joey Hess
51d6ec6744
force a sane umask when making temp gpg home dir
Someone reported:

gpg: WARNING: unsafe permissions on homedir `/var/folders/m6/zkd11n111m38ff37zbtgq0lr0000gp/T/git-annex-gpg.tmp.0'

Just a warning, but let's fix it anyway. Preumably the user has one of the
many insane and delightful umasks users sometimes use to shoot themselves
in their feet.
2014-07-03 15:43:09 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
bc7f143efc Added a comment 2014-07-03 19:39:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
1cc9a9eddb Added a comment: Same boat 2014-07-03 19:38:15 +00:00
http://joeyh.name/
22345957e9 Added a comment 2014-07-03 19:35:21 +00:00
Joey Hess
e0c02c8621 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-03 15:34:10 -04:00
http://joeyh.name/
e615ad65d4 Added a comment 2014-07-03 19:20:49 +00:00
http://joeyh.name/
a67812f0b3 Added a comment 2014-07-03 19:14:38 +00:00
http://joeyh.name/
b675c9570a Added a comment 2014-07-03 19:10:53 +00:00
Joey Hess
a3b0fb8330 close 2014-07-03 15:04:16 -04:00
http://joeyh.name/
cb08e06db5 Added a comment 2014-07-03 19:03:52 +00:00
Joey Hess
fc80956092
really add non-date metadata too 2014-07-03 14:35:20 -04:00
Joey Hess
4565b5263d Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-03 14:27:28 -04:00
Joey Hess
7d86e3fbbc
update for metadata 2014-07-03 14:26:28 -04:00
http://joeyh.name/
5d5362afb8 Added a comment: metadata 2014-07-03 18:25:32 +00:00
Joey Hess
7d28d08e85 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-03 14:17:26 -04:00
Joey Hess
d0c1a22e7c import metadata from feeds
When annex.genmetadata is set, metadata from the feed is added to files
that are imported from it.

Reused the same feedtitle and itemtitle, feedauthor, itemauthor, etc names
that are used in --template.

Also added title and author, which are the item title/author if available,
falling back to the feed title/author. These are more likely to be common
metadata fields.

(There is a small bit of dupication here, but once git gets
around to packing the object, it will compress it away.)

The itempubdate field is not included in the metadata as a string; instead
it is used to generate year and month fields, same as is done when adding
files with annex.genmetadata set.

This commit was sponsored by Amitai Schlair, who cooincidentially
is responsible for ikiwiki generating nice feed metadata!
2014-07-03 14:15:00 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
2d6342c076 2014-07-03 10:01:45 +00:00