diff options
| author | Carlos Martín Nieto <[email protected]> | 2017-07-08 20:58:08 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2017-07-08 21:34:10 +0200 |
| commit | b98b0e764066066fd9a5224468c15b50f6627fa9 (patch) | |
| tree | 61d3a367d55e2b8dce04d803e28b64514e3b6dbf /rebase_test.go | |
| parent | ce65c2303e9ba1f814ea4001ee437a7ecfcfb7b0 (diff) | |
rebase: correct the return values for CurrentOperationIndex
We were incorectly reporting `C.GIT_REBASE_NO_OPERATION` as an error code when
it is none. We should instead return it as the value. The compiler doesn't seem
to actually look at the sizes so instead we must recreate the value ourselves
with `^uint(0)`.
The error return is kept for API compatibility but should go away eventually.
Diffstat (limited to 'rebase_test.go')
| -rw-r--r-- | rebase_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rebase_test.go b/rebase_test.go index fb88a4e..ef4f920 100644 --- a/rebase_test.go +++ b/rebase_test.go @@ -182,7 +182,7 @@ func performRebaseOnto(repo *Repository, branch string) (*Rebase, error) { // Check no operation has been started yet rebaseOperationIndex, err := rebase.CurrentOperationIndex() - if err == nil { + if rebaseOperationIndex != RebaseNoOperation && err != ErrRebaseNoOperation { return nil, errors.New("No operation should have been started yet") } |
