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

Merge remote branch 'origin/master'

Browse source
This commit is contained in:
Joey Hess 2012-09-22 03:36:44 +00:00
commit 553d0d321e
3 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
doc/bugs/git-annex_sync_broken_on_squeeze_backports.mdwn Normal file
View file

@ -0,0 +1,18 @@
What steps will reproduce the problem?
git-annex sync
What is the expected output? What do you see instead?
The following error is mixed in with the output, took me a while to notice it:
Running: git ["--git-dir=/spare/annex/.git","--work-tree=/spare/annex","merge","--no-edit","refs/remotes/pip/synced/master"]
error: unknown option `no-edit'
What version of git-annex are you using? On what operating system?
3.20120629~bpo60+1 on debian squeeze
Please provide any additional information below.
Installing git from backports as well cleared up the problem.

8
doc/forum/git_annex_failing_to_get_non-English_filenames.__Rsync_problem__63__/comment_4_86b61b0484f3f4ecff657e46333b3d4f._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="sauluskahn"
ip="67.171.218.222"
subject="comment 4"
date="2012-09-22T03:01:02Z"
content="""
Sounds good, I'll get the next version through cabal and let you know if it's fixed. Thanks for your time!
"""]]

10
doc/forum/git_annex_failing_to_get_non-English_filenames.__Rsync_problem__63__/comment_5_5ffac00d08d26acaba8c3513b24c4d65._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="sauluskahn"
ip="67.171.218.222"
subject="comment 5"
date="2012-09-22T03:02:15Z"
content="""
>I'll let you know if it's *not* fixed.
Typo.
"""]]