Partial fix to issue #142#143
Closed
migurski wants to merge 2 commits intogitpython-developers:0.3from
migurski:patch-1
Closed
Partial fix to issue #142#143migurski wants to merge 2 commits intogitpython-developers:0.3from migurski:patch-1
migurski wants to merge 2 commits intogitpython-developers:0.3from
migurski:patch-1
Conversation
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 request
Mar 16, 2014
Addresses git version incompatibilities, more detail: * gitpython-developers/GitPython#142 * gitpython-developers/GitPython#143
Member
|
trigger travis-ci : close and reopen on mergeable request. |
Byron
added a commit
that referenced
this pull request
Nov 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 request
Nov 19, 2014
Member
|
The previous fix just removes the assertion, which seems to be the way to go right now. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Introduces a new, different error: