Giters

rconradharris / ply

Git Based Patch Management

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

Test warning messages

rconradharris opened this issue · comments

commented

Getting this when running the tests:

Failed to merge in the changes.
error: cache entry has null sha1: README
fatal: unable to write new index file

Using: git version 1.7.12.4 (Apple Git-37)

Don't recall getting this error message before. Need to test it against different versions of git.

commented

test_upstream_changed gives 'failed to merge in the changes'

test_abort gives that plus

error: cache entry has null sha1: README
fatal: unable to write new index file

Also, when it aborts it leaves the conflicting file in the working tree.