https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
cae5542095
2016-06-09 21:10:44 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
de165cf08d
Added a comment
2016-06-09 20:49:53 +00:00
Joey Hess
1fed64db26
filter out NoUUID remotes from syncDataRemotes
2016-06-09 16:38:47 -04:00
Joey Hess
43939c67d3
devblog
2016-06-09 16:36:26 -04:00
Joey Hess
0ea1969275
update test suite for lock/unlock with missing file content change in v6
2016-06-09 16:16:39 -04:00
Joey Hess
59f59de72e
followup
2016-06-09 16:04:21 -04:00
Joey Hess
7f5df6993c
add comment
2016-06-09 15:49:40 -04:00
Joey Hess
0fa04f4470
followup
2016-06-09 15:49:18 -04:00
Joey Hess
a8f2f29da1
pin crytonite on android to 0.15, which is the version I've been using
2016-06-09 15:34:37 -04:00
Joey Hess
a17845f75b
Merge branch 'master' of ssh://git-annex.branchable.com
2016-06-09 15:25:32 -04:00
Joey Hess
3789e6dab8
note
2016-06-09 15:25:16 -04:00
Joey Hess
b146e13bff
highlight v6 changes
2016-06-09 15:17:54 -04:00
Joey Hess
b6b5a11601
Make git clean filter preserve the backend that was used for a file.
2016-06-09 15:17:08 -04:00
Joey Hess
78952c1fcf
close
2016-06-09 14:47:07 -04:00
Joey Hess
7fe2ecff91
Fix update of associated files db when unlocking a file in a v6 repo.
2016-06-09 14:45:00 -04:00
Joey Hess
0bc7fee660
Make lock and unlock work in v6 repos on files whose content is not present.
2016-06-09 14:40:44 -04:00
Joey Hess
0249f3aff5
Fix bug in initialization of clone from a repo with an adjusted branch that had not been synced back to master.
...
This bug caused broken tree objects to get built by a later git annex sync.
This is a somewhat unlikely but not impossible situation, and the test
suite's union_merge_regression test tickled it when it was run on FAT.
2016-06-09 14:11:00 -04:00
openmedi
60dab21e18
2016-06-08 19:46:39 +00:00
Joey Hess
8e4cbefbc6
also avoid crashing in most circumstances if unable to determine the username
...
Mostly the username is only used for the git committer or other display
purposes, and we can just fall back to a dummy value in these cases.
The only remaining place where an error is thrown is when starting local
pairing, which needs the username to be known.
2016-06-08 15:04:15 -04:00
Joey Hess
a3ff99ea3b
Merge branch 'master' of ssh://git-annex.branchable.com
2016-06-08 14:29:37 -04:00
jgoerzen
8fb9d925ba
Added a comment: Still seeing this
2016-06-08 18:03:51 +00:00
Joey Hess
d62d81ee1c
Avoid a crash if getpwuid does not work, when querying the user's full name.
2016-06-08 13:48:03 -04:00
Joey Hess
88c85ae609
remove spam
2016-06-08 13:29:46 -04:00
Joey Hess
34c4640f66
devblog
2016-06-07 16:00:52 -04:00
Joey Hess
abeb2a6b81
Merge branch 'master' of ssh://git-annex.branchable.com
2016-06-07 13:25:38 -04:00
Joey Hess
9569d6be63
Fix bad automatic merge conflict resolution between an annexed file and a directory with the same name when in an adjusted branch.
...
When running in an overlay work tree, all unchanged files show as deleted,
so this code that stages deletions should not run.
2016-06-07 12:53:35 -04:00
ivan.iossifov@2673267f2e818d14a75f506d41738323cbc0bd04
04e408d6ae
2016-06-07 14:07:06 +00:00
chris@f4ea67aa5ae4709d79959f782fcebb5edae9a79b
d25b67a09c
Added a comment
2016-06-07 13:40:24 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
b40d13167e
2016-06-07 02:38:50 +00:00
juh
aedeafdb07
Added a comment: SOLVED
2016-06-06 15:45:12 +00:00
Roksolana
c15dd7756a
Added a comment: Coment 5
2016-06-06 14:59:08 +00:00
Roksolana
aa84f97c00
removed
2016-06-06 14:58:34 +00:00
Roksolana
7c4a9c5599
Added a comment: Long Path Tool
2016-06-06 14:57:48 +00:00
Gus
01869b04a6
Added a comment: I think I have figured out something
2016-06-05 22:42:17 +00:00
Joey Hess
74e01a2d01
move --to: Better behavior when system is completely out of disk space; drop content from disk before writing location log.
...
I noticed move --to failing when there was no disk space. The file was sent
to the remote, but it crashed before it could be dropped locally. This
could fix that.
2016-06-05 13:51:22 -04:00
xloem
3af83b945d
Added a comment
2016-06-05 02:57:42 +00:00
xloem
17a169841b
2016-06-05 02:45:42 +00:00
Joey Hess
33a76fa530
Merge branch 'master' of ssh://git-annex.branchable.com
2016-06-04 14:33:57 -04:00
Joey Hess
9996e04f41
list: Do not include dead repositories.
2016-06-04 14:33:31 -04:00
juh
0e9c821afa
2016-06-04 16:31:02 +00:00
Joey Hess
14ea28d787
Merge branch 'master' of ssh://git-annex.branchable.com
2016-06-03 17:03:38 -04:00
matei.david@d6acba23dba331f26fc4756d01c7ab65cf3aee4d
70dda871a7
Added a comment: A more detailed walkthrough
2016-06-03 18:48:11 +00:00
Joey Hess
8148ee3d4b
withAltRepo needs a separate queue of changes
...
The queue could potentially contain changes from before withAltRepo, and
get flushed inside the call, which would apply the changes to the modified
repo.
Or, changes could be queued in withAltRepo that were intended to affect
the modified repo, but don't get flushed until later.
I don't know of any cases where either happens, but better safe than sorry.
Note that this affect withIndexFile, which is used in git-annex branch
updates. So, it potentially makes things slower. Should not be by much;
the overhead consists only of querying the current queue a couple of times,
and potentially flushing changes queued within withAltRepo earlier, that
could have maybe been bundled with other later changes.
Notice in particular that the existing queue is not flushed when calling
withAltRepo. So eg when git annex add needs to stage files in the index,
it will still bundle them together efficiently.
2016-06-03 13:57:00 -04:00
Joey Hess
5ed3e6df3c
better failure diagnosis
2016-06-03 12:59:11 -04:00
Joey Hess
c3a687db19
Revert "removed"
...
This reverts commit be736d6191
2016-06-02 22:29:55 -04:00
Fheedah666@a521babeb96f01d88b722c185e5bb8cac2f9e946
be736d6191
removed
2016-06-03 02:14:03 +00:00
Joey Hess
0ff5947390
devblog
2016-06-02 17:03:14 -04:00
Joey Hess
907fc62f2c
Fix initialization of a bare clone of a repo that has an adjusted branch checked out.
2016-06-02 17:02:38 -04:00
Joey Hess
26887745a0
refactor isBareRepo
2016-06-02 16:59:47 -04:00
Joey Hess
c8dd196234
fix man page building
2016-06-02 16:54:58 -04:00
