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-03-30 14:28:41 -04:00
commit 5b0f3aa877
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/bugs/three_character_directories_created/comment_5_359b80948ac92a0f1eb695599456486c._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 5"
date="2013-03-30T18:01:28Z"
content="""
Clearly this can happen if the git-annex branch is merged into the master branch. I cannot think of any valid reason to want to do that. reset --hard git-annex would also do it; ditto.
Inclined to close this bug as user error; I'm pretty sure git-annex does not contain a bug that makes it merge in the git-annex branch on its own. Basically the only change that could be made to git-annex to prevent this kind of user error is to move the git-annex branch so it's not under refs/heads, and so is not a visible branch. But then `git push` would not push it either, which needs to happen.
"""]]