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 2020-01-22 12:40:20 -04:00
commit 6cc1f1dce9
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 54 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,37 @@
### Please describe the problem.
[git-annex Makefile: install-completions](http://source.git-annex.branchable.com/?p=source.git;a=blob;f=Makefile;h=965f53e1fc4a8f6d69041eabaccd759268f6490f;hb=HEAD#l87)
git-annex installs fish completions to the wrong directory. `$(SHAREDIR)/fish/completions` is the directory documented as being exclusive to completions which are shipped in the fish source code; third-party applications installing their own completions are intended to use `$(SHAREDIR)/fish/vendor_completions.d` instead.
See [https://fishshell.com/docs/current/index.html#completion-path](https://fishshell.com/docs/current/index.html#completion-path)
Note that this location can also be obtained in a similar manner to bash-completion:
```
$ pkg-config bash-completion --variable=completionsdir
/usr/share/bash-completion/completions
```
```
$ pkg-config fish --variable=completionsdir
/usr/share/fish/vendor_completions.d
```
### What steps will reproduce the problem?
Run "make install-completions", or install a linux distribution package of git-annex that builds with the current Makefile (Arch Linux or Debian will both show the same issue).
### What version of git-annex are you using? On what operating system?
Arch Linux
git-annex 7.20191230-7
### Please provide any additional information below.
Apparently this is a very common mistake :/ so far I've seen many more projects do this wrong than do it right.
### 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)
Not a user, just here to help improve cross-distro packaging. :)

17
doc/bugs/git_config_merge.ff__61__only_breaks_sync/comment_2_db82f6c4a27ac8ee862b5aaa45670085._comment Normal file
View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="dxld"
avatar="http://cdn.libravatar.org/avatar/742547a848e15c9f7fb381191c239141"
subject="comment 2"
date="2020-01-21T19:28:29Z"
content="""
Honestly I feel like the (perceived) semantics of sync are broken by this behaviour. I would expect git-annex to do what it has to to make what I asked for happen.
I agree that in general it's a good thing not to needlessly override git settings but for the sync command I really don't see any way that not merging can be considered sensible behaviour. To me as a user it just feels like I changed a setting completely unrelated to git-annex-sync and suddenly sync broke.
Consider this: the git-annex-sync(1) man page never actually mentions that it will run git-merge. On the other hand git-pull(1) is very forthcoming with the fact that it's just a shorthand for `git fetch; git merge` so it's obvious to me that settings affecting merge will affect git-pull, not so for sync.
I've been unable to sync my git-annex repos for a couple of months now because of this issue so firmly believe this is a serious usabiliy issue.
At the very least we have a documentation issue here. Though I would still argue the behaviour is bonkers :)
"""]]