Joey Hess
64ab652af4
pin ascii-progress version for now; big changes coming
2015-04-10 13:10:15 -04:00
Joey Hess
c45da74241
Merge branch 'master' into concurrentprogress
2015-04-10 12:45:42 -04:00
Joey Hess
d3d92abf95
spotted a few more places where diff-tree needed --
...
None of these are very likely at all to ever be ambiguous, since tree
refs almost never have symbolic names and the sha is very unlikely
to be in the work tree.. But, let's get it right!
2015-04-09 21:22:35 -04:00
Joey Hess
2879adc551
fix union merge to call diff-index with -- after the ref
...
Otherwise, if there's a file in the repo with a name matching the ref,
git could get confused and the merge not work.
2015-04-09 21:13:28 -04:00
Joey Hess
06211738c1
Fix activity log parsing.
...
I had some cargo culting in there that used the wrong type, so it failed
to parse old logs, and overwrote them with the new log.
2015-04-09 21:02:38 -04:00
Joey Hess
6387281cc8
Merge branch 'master' of ssh://git-annex.branchable.com
2015-04-09 17:05:53 -04:00
Joey Hess
00a8abac25
comment
2015-04-09 17:05:41 -04:00
https://launchpad.net/~eliasson
f469e8916b
Added a comment
2015-04-09 20:43:08 +00:00
Joey Hess
6c884fd556
Merge branch 'master' of ssh://git-annex.branchable.com
2015-04-09 16:40:52 -04:00
Joey Hess
0bff7e7596
add news item for git-annex 5.20150409
2015-04-09 16:40:50 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkQOUUx4LVAk6EnstSLvdv7gZc0NsRlHXw
b149f16915
Added a comment
2015-04-09 20:37:52 +00:00
Joey Hess
500cfbea5c
devblog
2015-04-09 16:32:25 -04:00
Joey Hess
055e101c54
response
2015-04-09 16:32:13 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlh1G1u_AMJEyADqlfuzV2cePniocDyK6A
3575ee59e2
2015-04-09 19:53:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl67y6EP2HTErhFl6ch4vDUHym6CH68Vnw
81fa244d5b
2015-04-09 19:48:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl67y6EP2HTErhFl6ch4vDUHym6CH68Vnw
e4653cda4c
2015-04-09 19:47:44 +00:00
Joey Hess
ce0a82f493
contentlocationn: New plumbing command.
2015-04-09 15:34:47 -04:00
Joey Hess
b22aacab44
prep release
2015-04-09 15:06:46 -04:00
Joey Hess
fa97dd9c3b
Merge branch 'master' of ssh://git-annex.branchable.com
2015-04-09 15:03:53 -04:00
Joey Hess
2736c59204
fix webapp reversion caused by relative path changes
...
webapp: When adding another local repository, and combining it with the
current repository, the new repository's remote path was set to "." rather
than the path to the current repository. This was a reversion caused by the
relative path changes in 5.20150113.
2015-04-09 14:59:08 -04:00
Joey Hess
148d5b2009
followup
2015-04-09 14:33:11 -04:00
Joey Hess
164803007d
followup
2015-04-09 14:29:10 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlh1G1u_AMJEyADqlfuzV2cePniocDyK6A
404a69b37d
2015-04-09 18:26:39 +00:00
Joey Hess
f24566ddde
cannot reproduce
2015-04-09 14:15:13 -04:00
Joey Hess
b99b8d5d4c
followup to bug I cannot reproduce, and analysis based presumptive fix
2015-04-09 14:03:44 -04:00
Joey Hess
e1d1c4f51c
followup
2015-04-09 13:49:11 -04:00
Joey Hess
9136d3c86f
comment
2015-04-09 13:45:47 -04:00
Joey Hess
44c897ef74
moreinfo needed
2015-04-09 13:42:28 -04:00
Joey Hess
0f740fd198
This fixes a bug in the assistant introduced by the literal pathspec changes in version 5.20150406.
...
git-checkignore refuses to work if any pathspec options are set. Urgh.
I audited the rest of git, and no other commands used by git-annex have
such limitations. Indeed, AFAICS, *all* other commands support
--literal-pathspecs. So, worked around this where git-checkignore is
called.
2015-04-09 13:37:06 -04:00
Joey Hess
3695094454
importfeed: Error out when passed a non-url.
2015-04-09 13:09:06 -04:00
Joey Hess
aa31af5594
importfeed: Fix feed download when curl is used.
...
This bug used to only afflict file:/// urls, but became more exposed
by b8f0b7309f
2015-04-09 13:02:57 -04:00
Joey Hess
c65e71e6a5
cleanup
2015-04-09 12:57:30 -04:00
Joey Hess
84dc5629c6
info: Display repository mode: bare when in a bare (non-direct mode) repo.
2015-04-09 12:28:26 -04:00
Joey Hess
0868472abb
Merge branch 'master' of ssh://git-annex.branchable.com
2015-04-09 12:26:57 -04:00
Joey Hess
d5a25bd567
proxy: Made it work when run in a new repository before initial commit.
2015-04-09 12:24:42 -04:00
https://launchpad.net/~eliasson
49797c725c
2015-04-09 14:51:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
4f1d5f391f
Added a comment
2015-04-09 13:17:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc
94717fe7c3
Added a comment
2015-04-09 05:37:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc
fad85e3758
Added a comment: I'm with Remy here
2015-04-09 05:02:50 +00:00
https://id.koumbit.net/anarcat
ff7fca1cf7
explicitely mention --force in tip body
2015-04-09 02:02:58 +00:00
Joey Hess
7a68b1978d
took another look at this
2015-04-08 18:09:05 -04:00
Joey Hess
a3aaee7e71
quick look at git-lfs
2015-04-08 17:53:12 -04:00
http://lhealy.livejournal.com/
7b3490cd51
2015-04-08 21:28:45 +00:00
Joey Hess
3c2cb25698
wording
2015-04-08 16:16:42 -04:00
Joey Hess
a662819fa3
Merge branch 'master' of ssh://git-annex.branchable.com
2015-04-08 16:15:48 -04:00
Joey Hess
4da371af1e
add: If annex.largefiles is set and does not match a file that's being added, the file will be checked into git rather than being added to the annex. Previously, git annex add skipped over such files; this new behavior is more useful in direct mode.
2015-04-08 16:14:23 -04:00
skew
578eea018f
2015-04-08 19:19:34 +00:00
skew
c2ab38b6f4
2015-04-08 19:17:53 +00:00
CandyAngel
883f0dfc61
Added a comment
2015-04-08 14:32:56 +00:00
CandyAngel
09e5f50f1e
Added a comment
2015-04-08 14:29:59 +00:00
