Joey Hess
4a66cd3f91
assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits.
2014-07-05 17:12:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
5969ae14e5
2014-07-05 20:57:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
9d7388745e
2014-07-05 20:56:04 +00:00
http://joeyh.name/
e08ef580ed
Added a comment
2014-07-05 20:34:39 +00:00
Joey Hess
91688ae46e
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-05 11:21:53 -04:00
Joey Hess
c5c4fd76ec
fix windows build
2014-07-05 11:18:59 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmqaNwDQ367zpW6cIRviLz6zJZZFODgoEI
0a56eb6855
2014-07-05 11:30:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnfM7ZF0Q5U9k1LljyDXH37cuXU5Gx6gtM
61a990fc19
Added a comment: fast migrate
2014-07-05 08:21:21 +00:00
EskildHustvedt
5ace35dfb9
2014-07-05 05:15:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
f973499dad
Added a comment
2014-07-04 22:30:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
e38fec4f52
Added a comment
2014-07-04 22:28:27 +00:00
Joey Hess
0116ee498b
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-04 18:12:08 -04:00
http://joeyh.name/
b5659c2a68
Added a comment
2014-07-04 22:09:38 +00:00
Joey Hess
51767d8e3b
devblog
2014-07-04 18:07:41 -04:00
Joey Hess
e0fc5bebab
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-04 18:01:02 -04:00
Joey Hess
c90e4e8778
work around getDirectoryContents not streaming lazily
2014-07-04 17:59:26 -04:00
http://joeyh.name/
3208b70a7f
Added a comment
2014-07-04 21:10:17 +00:00
http://joeyh.name/
768f236740
Added a comment
2014-07-04 20:57:54 +00:00
Joey Hess
1c036d08eb
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-04 16:40:05 -04:00
http://joeyh.name/
0d0451fca5
Added a comment
2014-07-04 19:53:43 +00:00
http://joeyh.name/
0a1875e508
Added a comment
2014-07-04 19:38:19 +00:00
Joey Hess
a2662088e3
dup
2014-07-04 15:34:55 -04:00
Joey Hess
2622fd3192
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-04 15:28:58 -04:00
Joey Hess
e6330988dd
Fix memory leak when committing millions of changes to the git-annex branch
...
Eg after git-annex add has run on 2 million files in one go.
Slightly unhappy with the neeed to use a temp file here, but I cannot see
any other alternative (see comments on the bug report).
This commit was sponsored by Hamish Coleman.
2014-07-04 15:28:07 -04:00
http://joeyh.name/
c85d20d02e
Added a comment
2014-07-04 19:26:00 +00:00
Joey Hess
326fdffce9
remove unused import
2014-07-04 15:24:35 -04:00
http://joeyh.name/
4b43f4e481
Added a comment
2014-07-04 18:36:49 +00:00
http://joeyh.name/
d0dbaddb46
Added a comment
2014-07-04 18:24:51 +00:00
Joey Hess
8f67151f2a
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-04 14:17:11 -04:00
http://joeyh.name/
7faf8b010a
Added a comment
2014-07-04 18:18:41 +00:00
Joey Hess
32fc3abfdd
bug report
2014-07-04 14:15:38 -04:00
http://joeyh.name/
41bd439a2f
Added a comment
2014-07-04 18:03:54 +00:00
http://joeyh.name/
e6ca67244b
Added a comment
2014-07-04 17:58:10 +00:00
Joey Hess
5d2759aa82
fix logic
2014-07-04 13:58:09 -04:00
http://joeyh.name/
a6cc41869c
Added a comment
2014-07-04 17:55:46 +00:00
http://joeyh.name/
6f2058e1e6
Added a comment
2014-07-04 17:52:41 +00:00
http://joeyh.name/
024086804b
Added a comment
2014-07-04 17:52:35 +00:00
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
