diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-03-30 14:28:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-30 14:28:41 -0400 |
| commit | e80e6ff43c6fb95a743cdc3ba1ae9e564b217632 (patch) | |
| tree | e05e171adf69c49f40429a56468e5be336fd84e6 | |
| parent | efd361d535798a59d690c6cc9930d8b6cc2cc922 (diff) | |
| parent | 6dcb88d4d76e92f8f3727f0669718e894b4d3011 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/bugs/three_character_directories_created/comment_5_359b80948ac92a0f1eb695599456486c._comment | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/bugs/three_character_directories_created/comment_5_359b80948ac92a0f1eb695599456486c._comment b/doc/bugs/three_character_directories_created/comment_5_359b80948ac92a0f1eb695599456486c._comment new file mode 100644 index 000000000..6942efe52 --- /dev/null +++ b/doc/bugs/three_character_directories_created/comment_5_359b80948ac92a0f1eb695599456486c._comment @@ -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. +"""]] |