mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2016-06-15 13:09:33 -04:00
commit 6fffc92a6d
Failed to extract signature
4 changed files with 68 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
doc/bugs/Empty_folders_don__39__t_get_remove/comment_2_35f59adc30fe743221f29bbfecff639b._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="jgoerzen"
subject="Experienced this"
date="2016-06-14T22:08:43Z"
content="""
Hi,
I experienced this just now. Have a git-annex assistant repo set up (so using direct mode).
On one machine, I mv'd entire directories out of the git-annex repo.
The other machine saw the files deleted, but the directories remained.
On the machine on which I mv'd directories out, git-annex actually re-created some of them with symlinks to now-nonexistant hashes! I have no idea why it did that.
"""]]

7
doc/bugs/Empty_folders_don__39__t_get_remove/comment_3_ccc703f8667805ce2886719c57e76ef8._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="jgoerzen"
subject="Version"
date="2016-06-14T22:35:59Z"
content="""
Forgot to add: 5.20151208
"""]]

37
doc/bugs/unannex__58___Cannot_proceed_with_uncommitted_changes_staged_in_the_index.mdwn Normal file
View file

@ -0,0 +1,37 @@
### Please describe the problem.
I understand that `git annex unannex` is essentially there for undoing an accidential `git annex add`. Unfortunately it doesn't do that.
If I have uncommited changes, which is the case after a `git annex add`, it tells me:
git-annex: Cannot proceed with uncommitted changes staged in the index. Recommend you: git commit
CallStack (from HasCallStack):
error, called at ./Command/Unannex.hs:48:19 in main:Command.Unannex
But I would expect it to `git reset` the file and then replace the symlink by the actual file content.
### What steps will reproduce the problem?
> git init
Initialized empty Git repository in /somewhere/.git
> git annex init
init ok
(recording state in git...)
> touch foo
> git annex add foo
add foo ok
(recording state in git...)
> git annex unannex foo
git-annex: Cannot proceed with uncommitted changes staged in the index. Recommend you: git commit
CallStack (from HasCallStack):
error, called at ./Command/Unannex.hs:48:19 in main:Command.Unannex
### What version of git-annex are you using? On what operating system?
git-annex version: 6.20160527-gf21a425
Installed from the Arch Linux repository.
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Sure, I'm using it for photos, music and videos

9
doc/todo/PATCH__58___Fixes_bug_where_webapp_allows_user_to_attempt_deleting_an_unsynced_repo.mdwn Normal file
View file

@ -0,0 +1,9 @@
I made an attempt to tackle the following bug:
[webapp should notice when remote deletion cannot complete due to not syncing](https://git-annex.branchable.com/bugs/webapp_should_notice_when_remote_deletion_cannot_complete_due_to_not_syncing/)
My changes are in the following git repository
[https://github.com/kathawala/git-annex.git](https://github.com/kathawala/git-annex.git)
And the specific commit which fixes the bug is in a branch titled "unsync-nodelete". I have tested the change, it greys out and disables the "Delete" option in the "Actions" dropdown menu of the webapp for any repo in the "Repolist" view which has its syncing disabled. There is also some hover text which explains why the option is greyed out. Hope it is satisfactory! Thanks for your great work!!