Commit graph

30250 commits

Author SHA1 Message Date
ilovezfs
eeaa670b61 2017-06-17 16:00:36 +00:00
avar
27f7c8d09a Added a comment 2017-06-16 20:37:48 +00:00
memeplex
63317c321c 2017-06-16 13:23:51 +00:00
t.z.mates
489d7f10f6 Added a comment 2017-06-15 23:07:48 +00:00
t.z.mates
09129a756d Added a comment: Error messages changed 2017-06-15 22:59:43 +00:00
glasserc
5991d5c1ab A wishlist item I would like 2017-06-14 21:26:39 +00:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
a93bcffcd7 2017-06-14 03:21:04 +00:00
Joey Hess
26137ef9fb
add news item for git-annex 6.20170520 2017-06-12 13:55:27 -04:00
Joey Hess
e4100fd60e
releasing package git-annex version 6.20170520 2017-06-12 13:55:00 -04:00
user4
b493ac8d35 Added a comment: remote.log 2017-06-11 19:53:27 +00:00
user4
add2f406a8 2017-06-11 19:27:15 +00:00
Joey Hess
ada1f56806
devblog 2017-06-09 17:00:46 -04:00
Joey Hess
3bd3885dbb
fix OSX build 2017-06-09 14:57:11 -04:00
Joey Hess
1426f7ff3a
disable closingTracked on OSX
Don't trust OSX FSEvents's eventFlagItemModified to be called when the last
writer of a file closes it; apparently that sometimes does not happen,
which prevented files from being quickly added.

This commit was sponsored by John Peloquin on Patreon.
2017-06-09 14:18:58 -04:00
Joey Hess
a20d8ed4cc
comment 2017-06-09 13:50:59 -04:00
Joey Hess
99a1e6efe2
close as dup 2017-06-09 13:43:53 -04:00
Joey Hess
aa2ab14a83
followup 2017-06-09 13:34:08 -04:00
Joey Hess
233f13b1e5
followup 2017-06-09 13:31:34 -04:00
Joey Hess
5be8df01cb
followup 2017-06-09 13:11:25 -04:00
Joey Hess
9db49af63f
Merge branch 'master' of ssh://git-annex.branchable.com 2017-06-09 11:42:51 -04:00
Joey Hess
5cf7216774
zsh and fish completions
optparse-applicative-0.14.0.0 adds support for these, so have the
Makefile install their scripts when built with it.

CmdLine/GitAnnex/Options.hs now uses action "file" in cmdParams,
which affects the bash and zsh completions, letting them complete
filenames for subcommands that use that. This is not needed for
bash, since bash-completion.bash enables -o bashdefault, which
lets it complete filenames too. But it does not seem to break the bash
completions. It is needed for zsh; the zsh completion otherwise
does not complete filenames. The fish completion will always complete
filenames no matter what. Messy.

This commit was sponsored by Denis Dzyubenko on Patreon.
2017-06-09 11:38:20 -04:00
Joey Hess
c6f087829e
update from optparse-applicative output
Fix local to use right case, and merge in IFS setting from a more recent
version of optparse-applicative.
2017-06-09 11:30:24 -04:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
e1164ce23a Added a comment 2017-06-09 01:48:15 +00:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
e19752a653 Added a comment 2017-06-09 01:40:01 +00:00
jeff
855f35d00d Added a comment 2017-06-07 21:24:36 +00:00
Joey Hess
28b80599e2
Merge branch 'master' of ssh://git-annex.branchable.com 2017-06-07 16:19:45 -04:00
Joey Hess
4a92eac23e
assistant: Merge changes from refs/remotes/foo/master into master.
Previously, only sync branches were merged. This makes regular git push
into a repository watched by the assistant auto-merge.

While this does hardcode an assumption about what the remote tracking
branch is named, which some unusual git configurations won't match,
git-annex sync already made the same assumption.

Also, changed behavior when a tracking branch like
refs/remotes/synced/not/master is received. When on the master branch,
that used to get merged into it, but it's the tracking branch for
not/master, so should only be merged in when on the not/master branch.

This commit was sponsored by Ewen McNeill.
2017-06-07 16:17:46 -04:00
ano.nymous@12ebd53e5933cd1730c84027a7cb905e7c3fdd9c
6a19f79c4a Added a comment: Workaround for switching repos from WebApp 2017-06-07 19:18:51 +00:00
Joey Hess
86e4ea00b2
analysis
Also, added a comment to Assistant/Threads/Merger.hs to explain
why it only merges from /synced/ branches.
2017-06-07 13:45:18 -04:00
Joey Hess
f62e6b358d
followup 2017-06-07 12:31:33 -04:00
Joey Hess
252f254349
more 2017-06-06 16:02:11 -04:00
Joey Hess
aff0ce86da
merge and followup window path length bugs 2017-06-06 15:57:35 -04:00
Joey Hess
bb5f22d815
response 2017-06-06 15:49:40 -04:00
Joey Hess
7b5c00eea7
followup 2017-06-06 15:42:27 -04:00
Joey Hess
eb79584bfe
followup; close 2017-06-06 15:36:10 -04:00
Joey Hess
3193d8258b
link to msdn article on enabling long paths 2017-06-06 15:24:37 -04:00
Joey Hess
baf9bda995
clarify that git update-server-info needs to be run on the server
forum/Trouble_setting_up_public_repo_cloneable_from_a_web_site/
was a user running that in their clone from the server..
2017-06-06 15:19:31 -04:00
Joey Hess
5687cc55f9
response 2017-06-06 14:46:56 -04:00
Joey Hess
19a6227e6e
remove temp file in failure case 2017-06-06 14:23:33 -04:00
Joey Hess
ed639c140d
Fix bug that prevented transfer locks from working when run on SMB or other filesystem that does not support fcntl locks and hard links.
This commit was sponsored by Ethan Aubin.
2017-06-06 14:22:03 -04:00
Joey Hess
fa50906a80
comment 2017-06-06 13:49:13 -04:00
Joey Hess
e0d90448b1
response 2017-06-06 13:43:09 -04:00
Joey Hess
1b89913db8
close 2017-06-06 13:37:18 -04:00
Joey Hess
f04353e066
response 2017-06-06 13:00:54 -04:00
Joey Hess
e23839acf3
Avoid error about git-annex-shell not being found when syncing with -J with a git remote where git-annex-shell is not installed.
This commit was sponsored by andrea rota.
2017-06-06 12:57:27 -04:00
Joey Hess
954a24b5d1
comment 2017-06-06 12:20:51 -04:00
Joey Hess
4f0715344e
response 2017-06-06 11:34:59 -04:00
Joey Hess
5a23ad28eb
update 2017-06-06 10:39:07 -04:00
openmedi
462459f41f 2017-06-05 17:09:38 +00:00
yibe
c8e8d36e85 Added a comment 2017-06-04 20:07:31 +00:00