Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Partial fix to issue #142#143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Closed
migurski wants to merge2 commits intogitpython-developers:0.3frommigurski:patch-1
Closed

Partial fix to issue #142#143

migurski wants to merge2 commits intogitpython-developers:0.3frommigurski:patch-1

Conversation

@migurski
Copy link

Introduces a new, different error:

Traceback (most recent call last):  File "test.py", line 188, in test_simple_conflict    commit2 = bizarro.repo.save_working_file(*args2)  File "/Users/migurski/Sites/tmp/CMS/bizarro/repo.py", line 77, in save_working_file    clone.remotes.origin.push(clone.active_branch.name)  File "/Users/migurski/Sites/tmp/CMS/venv-cms/lib/python2.7/site-packages/git/repo/base.py", line 551, in active_branch    return self.head.reference  File "/Users/migurski/Sites/tmp/CMS/venv-cms/lib/python2.7/site-packages/git/refs/symbolic.py", line 244, in _get_reference    raise TypeError("%s is a detached symbolic reference as it points to %r" % (self, sha))TypeError: HEAD is a detached symbolic reference as it points to '320ac0ab2ed85f0e65ad734e2a72863a526db5be'

Introduces a new, different error:    Traceback (most recent call last):      File "test.py", line 188, in test_simple_conflict        commit2 = bizarro.repo.save_working_file(*args2)      File "/Users/migurski/Sites/tmp/CMS/bizarro/repo.py", line 77, in save_working_file        clone.remotes.origin.push(clone.active_branch.name)      File "/Users/migurski/Sites/tmp/CMS/venv-cms/lib/python2.7/site-packages/git/repo/base.py", line 551, in active_branch        return self.head.reference      File "/Users/migurski/Sites/tmp/CMS/venv-cms/lib/python2.7/site-packages/git/refs/symbolic.py", line 244, in _get_reference        raise TypeError("%s is a detached symbolic reference as it points to %r" % (self, sha))    TypeError: HEAD is a detached symbolic reference as it points to '320ac0ab2ed85f0e65ad734e2a72863a526db5be'
migurski added a commit to migurski/git-jekyll-cms that referenced this pull requestMar 16, 2014
@Byron
Copy link
Member

trigger travis-ci : close and reopen on mergeable request.

@ByronByron closed thisMay 4, 2014
@ByronByron reopened thisMay 4, 2014
@ByronByron added this to thev0.3.3 milestoneNov 17, 2014
Byron added a commit that referenced this pull requestNov 19, 2014
The assertion will trigger, which shows that we are still getting thigs slightly wrong.For now, we are better off without.
Byron added a commit that referenced this pull requestNov 19, 2014
@Byron
Copy link
Member

Theprevious fix just removes the assertion, which seems to be the way to go right now.
For testing purposes, I have applied the change from this pull request, but found the assertion trigger again. This shows that I will have to look into this again just to be sure we parse the fetch information properly.

@ByronByron closed thisNov 19, 2014
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Milestone

v0.3.3

Development

Successfully merging this pull request may close these issues.

2 participants

@migurski@Byron
[8]ページ先頭
©2009-2025 Movatter.jp