Commit graph

31875 commits

Author SHA1 Message Date
Joey Hess
af4741b45f
Merge branch 'master' of ssh://git-annex.branchable.com 2018-05-20 14:00:53 -04:00
Yaroslav Halchenko
ea915b6777
Refresh standalone-build 2018-05-20 14:00:28 -04:00
andrew
a34f982e7a Added a comment: thoughts? 2018-05-20 17:41:29 +00:00
sorsasampo@35b3d76c4c73ffc3f2c89e965c47a3f6a2721228
38caaee8fc 2018-05-20 03:45:06 +00:00
allforabit
3e7e0901df Added a comment: Apologies 2018-05-19 23:48:06 +00:00
allforabit
4cadb44c4a removed 2018-05-19 23:41:19 +00:00
allforabit
2c7ad5d80d removed 2018-05-19 23:40:54 +00:00
https://openid-provider.appspot.com/iakornfeld
c97a6f9997 2018-05-18 14:02:29 +00:00
CandyAngel
5cbce5f308 2018-05-18 08:55:31 +00:00
spwhitton
d3117290cd Added a comment: patches welcome 2018-05-17 21:31:01 +00:00
anarcat
fa0c98d8de Added a comment: headless configs 2018-05-17 21:02:32 +00:00
anarcat
2c6c77bc16 Added a comment: .gitconfig was the cause, git-remote-gcrypt probably at fault 2018-05-17 20:42:37 +00:00
CandyAngel
295447a406 Added a comment 2018-05-17 20:21:47 +00:00
CandyAngel
4156c13221 Added a comment 2018-05-17 20:15:14 +00:00
spwhitton
d43e44e3e5 Added a comment: analysis 2018-05-17 19:49:04 +00:00
CandyAngel
1d58205284 Added a comment 2018-05-17 19:14:25 +00:00
anarcat
8f226fb7bd cross-ref with append-only 2018-05-17 18:15:14 +00:00
anarcat
990bb3085e another untrusted client idea 2018-05-17 18:14:17 +00:00
anarcat
e753c7de4f update: git repo now available. the previous paste expired, sorry about that. 2018-05-17 18:06:40 +00:00
anarcat
78a0bf4814 reproduced with remote-gcrypt 1.1 2018-05-17 17:39:35 +00:00
anarcat
fce32e6cd4 /dev/random is not necessary in git-annex 2018-05-17 17:38:41 +00:00
anarcat
fc68caa435 problems using gcrypt remote for basic stuff 2018-05-17 17:27:27 +00:00
https://christian.amsuess.com/chrysn
76014cc897 Notes from starting to use git-annex in termux 2018-05-17 09:48:23 +00:00
CandyAngel
bcf732aca5 2018-05-16 21:58:53 +00:00
https://christian.amsuess.com/chrysn
357680620f Added a comment: Platform addendum for "Debugging "No such file or directory"" 2018-05-15 20:29:57 +00:00
https://christian.amsuess.com/chrysn
2b087634ef Added a comment: Debugging "No such file or directory" 2018-05-15 19:57:34 +00:00
https://christian.amsuess.com/chrysn
bbbc1802cd Added a comment: Debugging "No such file or directory" 2018-05-15 19:19:38 +00:00
https://openid-provider.appspot.com/iakornfeld
65f55e448c Added a comment: Looking at code 2018-05-15 19:01:10 +00:00
CandyAngel
6c91ebc2c2 Added a comment 2018-05-15 16:15:32 +00:00
Joey Hess
8c8e1f8b7a
close 2018-05-15 12:07:35 -04:00
Joey Hess
d135705b32
close 2018-05-15 12:03:43 -04:00
Joey Hess
60780a8605
close since anarcat thinks inprogress is good enough 2018-05-15 12:01:30 -04:00
Joey Hess
fbfb2b85ec
close 2018-05-15 12:00:50 -04:00
Joey Hess
d39457035b
response 2018-05-15 11:56:45 -04:00
Joey Hess
2463d4b855
response 2018-05-15 11:54:02 -04:00
https://openid-provider.appspot.com/iakornfeld
47ff8fa976 more failures to copy/paste 2018-05-15 15:15:37 +00:00
https://openid-provider.appspot.com/iakornfeld
5ed04a326a Added a comment: Another weird bit 2018-05-15 14:59:42 +00:00
https://openid-provider.appspot.com/iakornfeld
28c1348140 fix failure to copy/paste 2018-05-15 14:56:54 +00:00
https://openid-provider.appspot.com/iakornfeld
24959e9acd 2018-05-15 14:55:14 +00:00
Joey Hess
442e607b0a
Don't allow entering a view with staged or unstaged changes.
In some cases, unstaged changes are safe, eg dotfiles in the top which
are not affected by a view. Or non-annexed files in general which would
prevent view branch checkout from proceeding. But in other cases,
particularly unstaged changes to annexed files, entering a view would wipe
out those changes! And so don't allow entering a view with any unstaged
changes.

Staged changes are not safe when entering a view, because the changes get
committed to the view branch, and so the user is unlikely to remember them
when they exit the view, and so will effectively lose them, even if they're
still present in the view branch.

Also, improved the git status parser, although the improvement turned out
to not really be needed.

This commit was sponsored by Eric Drechsel on Patreon.
2018-05-14 16:51:06 -04:00
Joey Hess
d7021d420f
reuse hashes of dotfiles/dirs/submodules when entering view
This fixes a crash when a git submodule has a name starting with a dot.
Such a submodule might contain dotfiles that are intended to be used when
inside the view (since a dot-directory that's not a submodule was already
preserved when entering a view). So, rather than eliminating the submodule
from the view, its git ls-files --stage hash is copied over into the view.

dotfiles/dirs have their git ls-files --stage hashes similarly copied over
to the view. This is more efficient and simpler than the old method,
and also won't break if git ever adds a new type of tree item, like was
done with submodules.

Since the content of dotfiles in the working tree is no longer hashed
when entering a view, when there are unstaged modifications, they are
not included in the view branch. Entering the view branch still works,
but git checkout shows "M .dotfile", and git diff will show the unstaged
changes. This seems like an improvement over the old behavior.

Also made Command.View not delete empty directories that are submodules
when entering a view, while still deleting other empty directories.

This commit was supported by the NSF-funded DataLad project.
2018-05-14 15:35:20 -04:00
Joey Hess
0b7f6d24d3
rename BlobType and add submodule to it
This was badly named, it's a not a blob necessarily, but anything that a
tree can refer to.

Also removed the Show instance which was used for serialization to git
format, instead use fmtTreeItemType.

This commit was supported by the NSF-funded DataLad project.
2018-05-14 14:45:41 -04:00
Joey Hess
a732004616
update 2018-05-14 13:18:20 -04:00
Joey Hess
6fffcccb53
followup 2018-05-14 13:15:27 -04:00
spwhitton
00de253d83 Added a comment 2018-05-10 17:51:35 +00:00
gdkags@28c74e22834edcf63c178e595b8649e5af5151d4
e646b22fd2 Added a comment: fine with me! 2018-05-10 13:02:23 +00:00
ga@2217a6e07239bc6b36af2a9134b2647fdebcabcd
61d083765e Added a comment: Arm processor on Synology device 2018-05-10 11:07:44 +00:00
CandyAngel
c467ac1775 Added a comment 2018-05-10 10:23:49 +00:00
Joey Hess
86958fda5d
fix build with old http-client 2018-05-10 00:22:23 -04:00
Joey Hess
e8ffa8d54b
link to release build 2018-05-09 16:46:17 -04:00