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 2013-12-11 18:04:40 -04:00
commit 9b1bcb9e6b
2 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password..mdwn Normal file
View file

@ -0,0 +1,17 @@
### Please describe the problem.
I get this error when configuring jabber:
/etc/resolv.conf: openFile: does not exist (No such file or directory)
### What steps will reproduce the problem?
Just submit the jabber username and password.
### What version of git-annex are you using? On what operating system?
$ git annex version
git-annex version: 5.20131130-gc25be33
build flags: Assistant Webapp Testsuite S3 WebDAV Inotify XMPP DNS Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav glacier hook

17
doc/forum/Can_Not_Sync_to_Git_Repo/comment_6_10e114da6a2bb54b860b44767ba1ca94._comment Normal file
View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo"
nickname="Tobias"
subject="same here"
date="2013-12-11T19:57:09Z"
content="""
I'm facing the same situation as the other commenters.
git-annex version: 5.20131130-gc25be33
[...]
(merging gitlab/synced/git-annex into git-annex...)
(Recording state in git...)
fatal: Cannot force update the current branch.
git-annex: failed to update refs/heads/master
Seems to be a problem with the command `git branch -f master`
"""]]