Commit graph

28570 commits

Author SHA1 Message Date
Joey Hess
c910004d50
addurl, importfeed: Improve behavior when file being added is gitignored. 2016-09-21 17:21:48 -04:00
Joey Hess
f7ac2bc868
comment 2016-09-21 16:46:45 -04:00
Joey Hess
db2eba442a
comment 2016-09-21 16:38:02 -04:00
Joey Hess
44acb145e0
comment 2016-09-21 16:23:41 -04:00
Joey Hess
ca5902e14f
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-21 16:15:13 -04:00
Joey Hess
bd2cfe008c
response 2016-09-21 16:14:11 -04:00
Joey Hess
0de88a9b68
response 2016-09-21 16:05:50 -04:00
Joey Hess
10b22a2548
comment 2016-09-21 15:58:02 -04:00
Joey Hess
3b2222d753
update 2016-09-21 15:53:34 -04:00
Joey Hess
181d027ace
merge 2016-09-21 15:47:37 -04:00
Joey Hess
08b7832d9d
comment 2016-09-21 15:39:32 -04:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
3ed30143a7 Added a comment 2016-09-21 19:32:07 +00:00
Joey Hess
5057234dec
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-21 15:24:53 -04:00
Joey Hess
a569f195b7
fix bugs in handing of deep branches with sync and adjusted branches
* sync: Previously, when run in a branch with a slash in its name,
  such as "foo/bar", the sync branch was "synced/bar". That conflicted
  with the sync branch used for branch "bar", so has been changed to
  "synced/foo/bar".
* adjust: Previously, when adjusting a branch with a slash in its name,
  such as "foo/bar", the adjusted branch was "adjusted/bar(unlocked)".
  That conflicted with the adjusted branch used for branch "bar",
  so has been changed to "adjusted/foo/bar(unlocked)"
* Also, running sync in an adjusted branch did not correctly sync
  changes back to the parent branch when it had a slash in its name.
  This bug has been fixed.

Eliminate use of Git.Ref.under and Git.Ref.basename; using
Git.Ref.underBase and Git.Ref.base make everything handle deep branches
correctly.

Probably noone was adjusting deep branches, and v6 is still experimental
anyway, so I'm not going to worry about the mess that was left by that bug.

In the case of git-annex sync, using a fixed git-annex with an old unfixed
one will mean they use different sync branches for a deep branch, and so
they may stop syncing until the old one is upgraded. However, that's only
a problem when syncing between repositories without going via a central
bare repository. Added a warning about this to the CHANGELOG, but it's
probably not going to affect many people at all.

This commit was sponsored by Riku Voipio.
2016-09-21 15:23:47 -04:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
8abcc4c282 Added a comment: Pre Commit Hook 2016-09-21 19:20:05 +00:00
Joey Hess
99982e2830
improve comment 2016-09-21 14:57:44 -04:00
Joey Hess
8dae86eac2
bug 2016-09-21 14:57:20 -04:00
Joey Hess
489b9c8869
comments 2016-09-21 14:29:17 -04:00
Joey Hess
f6fc40456d
comment, retitle 2016-09-21 13:42:42 -04:00
Joey Hess
ce03779e8c
comment and close 2016-09-21 13:32:45 -04:00
Joey Hess
460f7c09b7
response 2016-09-21 13:22:47 -04:00
Joey Hess
74c6d5a8ff
comment 2016-09-21 13:19:02 -04:00
Joey Hess
154a501b76
comment 2016-09-21 13:17:03 -04:00
Joey Hess
886ef2d005
lacking problem description 2016-09-21 13:09:35 -04:00
Joey Hess
c2218b78c3
close 2016-09-21 13:06:34 -04:00
Joey Hess
1702505f60
comment 2016-09-21 13:06:12 -04:00
Joey Hess
bfc8d649b8
comment 2016-09-21 12:56:35 -04:00
Joey Hess
6c6304b2f2
comment 2016-09-21 12:53:29 -04:00
Joey Hess
d905d418d3
comment 2016-09-21 12:51:40 -04:00
Joey Hess
9ed7246a60
answer 2016-09-21 12:49:38 -04:00
Joey Hess
7bbb9f9370
comment 2016-09-21 12:16:52 -04:00
Joey Hess
3d5cae918c
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-21 11:58:49 -04:00
Joey Hess
e5760d00ac
update 2016-09-21 11:32:40 -04:00
braiamp@5e499cae72e60f63a517d773978deffdfec35c4c
c1c132c2d7 2016-09-21 05:35:43 +00:00
PaulK
13ed6c83bb Added a comment 2016-09-19 04:39:08 +00:00
kevin@f9ce8e46ad8c29b25093b82cf68fae38f54b89a1
d4998bfb51 Added a comment: Groups... 2016-09-18 20:35:01 +00:00
kevin@f9ce8e46ad8c29b25093b82cf68fae38f54b89a1
132c074e28 2016-09-18 18:57:18 +00:00
https://anarc.at/openid/
da089228e1 promote the neurodebian backport since the official backport looks like it will never come 2016-09-18 01:56:21 +00:00
git-starter
2f4901f576 2016-09-16 14:40:49 +00:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
7c5ff428a8 I got the files to come back, but I don't want Android making these dumb delete-loads-of-newly-added-stuff commits 2016-09-16 03:03:19 +00:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
d62ee47ab3 2016-09-16 01:56:57 +00:00
Joey Hess
45a59390d2
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-15 13:24:03 -04:00
Joey Hess
0e30e71e9c
info: Support being passed a treeish, and show info about the annexed files in it similar to how a directory is handled. 2016-09-15 12:51:00 -04:00
Adam000
efeb0c4f78 Added a comment 2016-09-15 16:03:42 +00:00
Adam000
95df12fa9a Added a comment 2016-09-15 15:57:59 +00:00
Adam000
4bdfb52f0b 2016-09-15 09:28:55 +00:00
Joey Hess
c9c6db5ebc
comment 2016-09-15 00:55:15 -04:00
Joey Hess
bf53f4a7e3
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-15 00:37:58 -04:00
Joey Hess
e181603103
stack.yaml: Update to lts-7.0 (ghc 8)
A few of these extra-deps are setting versions to work around various
library dep issues with ghc 8.
2016-09-15 00:37:05 -04:00
Joey Hess
9cd3fb4110
remove redundant constraint 2016-09-15 00:04:56 -04:00