Crash while stashing in the middle of a conflict

[feth]

I just tried to rebase a git tree onto another remote, and of course got conflicts.

This is what git says:

$ git status 
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       both modified:      ../some/file

This is what gitbuster says (command: gitbuster ~/repo-name)

Unclean repository The chosen repository has unstaged changes. You should commit or stash them. Do you want to continue anyway ? [Yes] [No] [Stash]

This is what happens when I choose 'stash':

Traceback (most recent call last):                                                                                                                                                                                                                                             
  File "/home/feth/.virtualenvs/gitbuster/bin/gitbuster", line 5, in <module>                                                                                                                                                                                                  
    pkg_resources.run_script('gitbuster==2.1b7', 'gitbuster')                                                                                                                                                                                                                  
  File "/home/feth/.virtualenvs/gitbuster/lib/python2.6/site-packages/distribute-0.6.15-py2.6.egg/pkg_resources.py", line 467, in run_script                                                                                                                                   
    self.require(requires)[0].run_script(script_name, ns)                                                                                                                                                                                                                      
  File "/home/feth/.virtualenvs/gitbuster/lib/python2.6/site-packages/distribute-0.6.15-py2.6.egg/pkg_resources.py", line 1200, in run_script
    execfile(script_filename, namespace, namespace)
  File "/home/feth/.virtualenvs/gitbuster/lib/python2.6/site-packages/gitbuster-2.1b7-py2.6.egg/EGG-INFO/scripts/gitbuster", line 15, in <module>
    main()
  File "/home/feth/.virtualenvs/gitbuster/lib/python2.6/site-packages/gitbuster-2.1b7-py2.6.egg/gitbuster/__init__.py", line 64, in main
    test_repo.git.stash()
  File "/home/feth/.virtualenvs/gitbuster/lib/python2.6/site-packages/GitPython-0.3.1-py2.6.egg/git/cmd.py", line 219, in <lambda>
    return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
  File "/home/feth/.virtualenvs/gitbuster/lib/python2.6/site-packages/GitPython-0.3.1-py2.6.egg/git/cmd.py", line 430, in _call_process
    return self.execute(call, **_kwargs)
  File "/home/feth/.virtualenvs/gitbuster/lib/python2.6/site-packages/GitPython-0.3.1-py2.6.egg/git/cmd.py", line 351, in execute
    raise GitCommandError(command, status, stderr_value)
git.exc.GitCommandError: 'git stash' returned exit status 1: some-repo/some/file: unmerged (ec3e06c9080ea2328b4d276ece8f7c57a043dc74)
some-repo/some/file: unmerged (06a7bb010fd251b1cd3658d45f260576397a53df)
some-repo/some/file: unmerged (ab738a8abd16a9d3ae53c7f19ba0fd5d69425323)
fatal: git-write-tree: error building trees
Cannot save the current index state

gitbuster was installed in its own virtualenv with

make update-code
make clean
make install

I use master and the last commit on gitbuster is 5bf857b2acb5b98fa77d179cccb3e91883ca42b5 "Quick release to make gfbi_core installation work again.", last commit on gfbi_core is 722be9178d5d6334938fd85f5f31be8048cd5538 "Temporary release before we find another binding than GitPython."

[feth]

I have a rebase-apply dir in .git but no rebase-merge dir in my .git directory.

[mike-perdide]

This looks like a GitPython bug. I'll look into it but I think the best thing to do is wait for the new pygit2/gfbi_core version.

[feth]

Then I add the "3rd party" tag.

[feth]

I also crashed after clicking [yes] when in a conflict.

TypeError: HEAD is a detached symbolic reference as it points to '4c85c7c0978485c40874d51f980f3dcdbf561b7e' stash -> git.exc.GitCommandError: 'git stash' returned exit status 1: monologue/core.py: unmerged (a1e11abe63f253e6a1945887115dbd9d1d02f5e4)