Carlos Martín Nieto
fe21d708b0
Plug a few leaks
2015-03-04 00:29:37 +01:00
Carlos Martín Nieto
23a17803b6
reset: remove reflog message override
...
This function is meant to simulate what git does in the reset command,
so we should include the reflog message in that.
2015-03-03 14:40:50 +01:00
Carlos Martín Nieto
659cf2029f
Remove the signature from ref-modifying functions
...
The signature for the reflog is not something which changes
dynamically. Almost all uses will be NULL, since we want for the
repository's default identity to be used, making it noise.
In order to allow for changing the identity, we instead provide
git_repository_set_ident() and git_repository_ident() which allow a user
to override the choice of signature.
2015-03-03 14:40:50 +01:00
Edward Thomson
3cbaa5872c
rebase: check alloc result
2015-02-27 04:39:54 +00:00
Carlos Martín Nieto
a291790a8d
Merge pull request #2831 from ethomson/merge_lock
...
merge: lock index during the merge (not just checkout)
2015-02-15 05:18:01 +01:00
Edward Thomson
41fae48df2
indexwriter: an indexwriter for repo operations
...
Provide git_indexwriter_init_for_operation for the common locking
pattern in merge, rebase, revert and cherry-pick.
2015-02-14 09:25:36 -05:00
Edward Thomson
be8404a768
merge-like operations: lock index while working
2015-02-14 09:25:35 -05:00
Edward Thomson
ffbd51edc8
rebase: CHECKOUT_SAFE instead of FORCE
...
Switch to a standard branch-switching pattern of a `SAFE` checkout,
then updating `HEAD`.
2015-02-13 11:38:00 -05:00
Edward Thomson
49b8293c75
rebase: allow NULL branch to indicate HEAD
...
Don't require the branch to rebase, if given `NULL`, simply look up
`HEAD`.
2015-02-13 11:20:32 -05:00
Edward Thomson
92e87dd749
rebase: provide NULL exec on non-EXEC operations
...
Users may want to try to pay attention to the `exec` field on all
rebase operations.
2015-02-13 10:44:19 -05:00
Jameson Miller
02eb1495a5
Check rebase options version on public entry points
2015-02-12 15:32:52 -05:00
Jacques Germishuys
3dbd9a0e86
Check the result of git_buf_joinpath
2014-12-30 12:33:39 +02:00
Jacques Germishuys
6f73e02605
Plug some leaks
2014-12-29 18:18:49 +02:00
Carlos Martín Nieto
21083a7129
notes: move the notes name argument
...
Make it consistent between git_note_create() and git_note_remote() by
putting it after the repository.
2014-12-06 04:20:09 +01:00
Edward Thomson
979645a719
rebase: updates based on PR comments
2014-10-26 22:59:50 -04:00
Edward Thomson
18b00406c6
s/git_merge_head/git_annotated_commit
...
Rename git_merge_head to git_annotated_commit, as it becomes used
in more operations than just merge.
2014-10-26 22:59:48 -04:00
Edward Thomson
796b03bd49
rebase: clean up some warnings and memory leaks
2014-10-26 22:59:46 -04:00
Edward Thomson
e69737d760
rebase: oid member of operation should be const
2014-10-26 22:59:43 -04:00
Edward Thomson
ed2c06a6a1
git_rebase: iterators for operations
2014-10-26 22:59:41 -04:00
Edward Thomson
f152f8ac0c
rebase: preload all operations
2014-10-26 22:59:38 -04:00
Edward Thomson
b6b636a7fa
rebase: init/open a git_rebase object
2014-10-26 22:59:36 -04:00
Edward Thomson
18b439b9be
git_rebase_next: provide info about the operation
2014-10-26 22:59:34 -04:00
Edward Thomson
5ae9d296e3
git_rebase_finish: rewrite notes when finishing rebase
2014-10-26 22:59:32 -04:00
Edward Thomson
a612a25fa6
git_rebase_commit: write HEAD's reflog appropriately
2014-10-26 22:59:27 -04:00
Edward Thomson
517644cce4
Introduce git_rebase_finish to complete a rebase
2014-10-26 22:59:25 -04:00
Edward Thomson
93a7004cc2
git_rebase_commit: drop already-picked commits
...
Already cherry-picked commits should not be re-included. If all changes
included in a commit exist in the upstream, then we should error with
GIT_EAPPLIED.
2014-10-26 22:59:21 -04:00
Edward Thomson
a35a9890b0
Introduce git_rebase_commit
...
Commit the current patch of a rebase process.
2014-10-26 22:59:19 -04:00
Edward Thomson
443d5674fe
git_rebase_next: write conflicts nicely during rebase
2014-10-26 22:59:16 -04:00
Edward Thomson
950a709159
Introduce git_rebase_next
...
`git_rebase_next` will apply the next patch (or cherry-pick)
operation, leaving the results checked out in the index / working
directory so that consumers can resolve any conflicts, as appropriate.
2014-10-26 22:59:14 -04:00
Edward Thomson
4fe84d624b
Introduce git_rebase_abort
...
Abort an in-progress rebase and move the working directory and
repository back to the ORIG_HEAD state.
2014-10-26 22:59:12 -04:00
Edward Thomson
867a36f3a6
Introduce git_rebase to set up a rebase session
...
Introduce `git_rebase` to set up a rebase session that can
then be continued. Immediately, only merge-type rebase is
supported.
2014-10-26 22:59:08 -04:00
