delta/libgit2.git/tests/rebase, branch ethomson/refresh_objects

rebase: test rebasing a new commit with subfolder

2016-06-02T07:38:18+00:00

Test a rebase (both a merge rebase and an inmemory rebase) with a new
commit that adds files underneath a new subfolder.

rebase: test rebase (merge) w/ no common ancestor

2016-05-03T19:29:44+00:00

rebase::abort: test we can abort rebase by revspec

2016-04-26T15:49:05+00:00

Test that we can properly abort a rebase when it is initialized by a
revspec.  This ensures that we do not conflate revspecs and refnames.

rebase: correctly finish rebasing detached heads

2016-04-21T22:19:05+00:00

When rebasing with IDs, we do not return to the `branch`,
we remain in a detached HEAD state.

rebase: test abort immediately after init

2016-04-21T22:19:05+00:00

Instead of `open`ing a rebase and `abort`ing that, test that we can
`abort` a rebase that has just begun with `init`.

Merge pull request #3623 from ethomson/rebase_with_commit

2016-03-09T22:45:33+00:00

rebase: additional setup tests of exotic behavior

rebase: additional tests for completing a rebase

2016-02-29T01:10:44+00:00

rebase: additional setup tests of exotic behavior

2016-02-17T16:22:15+00:00

Test some additional exotic rebase setup behavior:  that we are
able to set up properly when already in a detached HEAD state,
that the caller specifies all of branch, upstream and onto,
and that the caller specifies branch, upstream and onto by ID.

rebase: persist a single in-memory index

2016-02-15T19:27:06+00:00

When performing an in-memory rebase, keep a single index for the
duration, so that callers have the expected index lifecycle and
do not hold on to an index that is free'd out from under them.

rebase: allow custom merge_options

2016-02-11T18:49:25+00:00

Allow callers of rebase to specify custom merge options.  This may
allow custom conflict resolution, or failing fast when conflicts
are detected.