kmx git

Commit	Date	Message
909d5494	2016-12-29T12:25:15	giterr_set: consistent error messages Error messages should be sentence fragments, and therefore: 1. Should not begin with a capital letter, 2. Should not conclude with punctuation, and 3. Should not end a sentence and begin a new one
f928c69a	2016-12-29T12:54:26	rebase: check the result code of rebase_init_merge
4db1fc7e	2016-12-01T23:06:41	git_rebase_init: correctly handle detached HEAD git_rebase_finish relies on head_detached being set, but rebase_init_merge was only setting it when branch->ref_name was unset. But branch->ref_name would be set to "HEAD" in the case of detached HEAD being either implicitly (NULL) or explicitly passed to git_rebase_init.
3cc5ec94	2016-10-05T12:57:53	rebase: don't ask for time sorting `git-rebase--merge` does not ask for time sorting, but uses the default. We now produce the same default time-ordered output as git, so make us of that since it's not always the same output as our time sorting.
4505a42a	2016-05-26T12:42:43	rebase: change assertion to avoid It looks like we're getting the operation and not doing anything with it, when in fact we are asserting that it's not null. Simply assert that we are within the operation boundary instead of using the `git_array_get` macro to do this for us.
9a363d1b	2016-05-03T15:29:50	rebase: handle no common ancestor for inmemory
1f84caf0	2016-04-21T18:16:37	rebase: correctly finish rebasing detached heads When rebasing with IDs, we do not return to the `branch`, we remain in a detached HEAD state.
badc7283	2016-04-21T17:29:19	rebase: handle detached HEADs in `init` When `init`ing a rebase from a detached HEAD, be sure to remember that we were in a detached HEAD state so that we can correctly `abort` the object that we just created.
2afb6fa4	2016-02-22T16:05:13	rebase: plug memory leak in `rebase_alloc` Convert `rebase_alloc` to use our usual error propagation patterns, that is accept an out-parameter and return an error code that is to be checked by the caller. This allows us to use the GITERR_CHECK_ALLOC macro, which helps static analysis.
f28bae0c	2016-02-15T17:16:00	rebase: persist a single in-memory index 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.
a202e0d4	2016-02-11T10:11:21	rebase: allow custom merge_options Allow callers of rebase to specify custom merge options. This may allow custom conflict resolution, or failing fast when conflicts are detected.
ee667307	2016-02-11T10:48:48	rebase: introduce inmemory rebasing Introduce the ability to rebase in-memory or in a bare repository. When `rebase_options.inmemory` is specified, the resultant `git_rebase` session will not be persisted to disk. Callers may still analyze the rebase operations, resolve any conflicts against the in-memory index and create the commits. Neither `HEAD` nor the working directory will be updated during this process.
768f8be3	2015-06-30T19:00:41	Fix #3094 - improve use of portable size_t/ssize_t format specifiers. The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c. For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.
02980bdc	2015-06-09T16:53:07	Initialize a few variables Coverity complains about the git_rawobj ones because we use a loop in which we keep remembering the old version, and we end up copying our object as the base, so we want to have the data pointer be NULL.
94c988f6	2015-04-20T17:19:08	rebase: include checkout opts within rebase opts
f3a199dd	2015-03-17T15:53:04	rebase: init and open take a rebase_options `git_rebase_init` and `git_rebase_open` should take a `git_rebase_options` and use it for future rebase operations on that `rebase` object.
5ae38538	2015-03-17T11:47:16	rebase: take `checkout_options` where appropriate
eaf0d688	2015-03-17T17:53:07	rebase: block rebase_commit with unstaged changes
30640aa9	2015-03-17T10:04:08	rebase: identify a rebase that has not started In `git_rebase_operation_current()`, indicate when a rebase has not started (with `GIT_REBASE_NO_OPERATION`) rather than conflating that with the first operation being in-progress.
fe21d708	2015-03-04T00:29:37	Plug a few leaks
23a17803	2015-01-07T14:16:50	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.
659cf202	2015-01-07T12:23:05	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.
3cbaa587	2015-02-27T04:39:54	rebase: check alloc result
a291790a	2015-02-15T05:18:01	Merge pull request #2831 from ethomson/merge_lock merge: lock index during the merge (not just checkout)
41fae48d	2015-02-03T22:31:10	indexwriter: an indexwriter for repo operations Provide git_indexwriter_init_for_operation for the common locking pattern in merge, rebase, revert and cherry-pick.
be8404a7	2015-02-03T21:51:48	merge-like operations: lock index while working
ffbd51ed	2015-02-13T11:38:00	rebase: `CHECKOUT_SAFE` instead of `FORCE` Switch to a standard branch-switching pattern of a `SAFE` checkout, then updating `HEAD`.
49b8293c	2015-02-13T11:20:32	rebase: allow `NULL` branch to indicate `HEAD` Don't require the branch to rebase, if given `NULL`, simply look up `HEAD`.
92e87dd7	2015-02-13T10:44:19	rebase: provide NULL `exec` on non-EXEC operations Users may want to try to pay attention to the `exec` field on all rebase operations.
02eb1495	2015-02-12T15:32:52	Check rebase options version on public entry points
3dbd9a0e	2014-12-24T11:43:38	Check the result of git_buf_joinpath
6f73e026	2014-12-24T11:42:50	Plug some leaks
21083a71	2014-12-06T03:12:04	notes: move the notes name argument Make it consistent between git_note_create() and git_note_remote() by putting it after the repository.
979645a7	2014-10-04T20:17:26	rebase: updates based on PR comments
18b00406	2014-10-03T19:02:29	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.
796b03bd	2014-10-03T20:47:48	rebase: clean up some warnings and memory leaks
e69737d7	2014-09-11T16:46:46	rebase: oid member of operation should be const
ed2c06a6	2014-09-11T16:47:20	git_rebase: iterators for operations
f152f8ac	2014-08-26T16:18:46	rebase: preload all operations
b6b636a7	2014-08-25T13:29:50	rebase: init/open a git_rebase object
18b439b9	2014-08-23T18:19:34	git_rebase_next: provide info about the operation
5ae9d296	2014-07-21T12:25:03	git_rebase_finish: rewrite notes when finishing rebase
a612a25f	2014-07-18T18:22:54	git_rebase_commit: write HEAD's reflog appropriately
517644cc	2014-07-18T17:19:10	Introduce git_rebase_finish to complete a rebase
93a7004c	2014-07-18T14:50:06	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.
a35a9890	2014-07-17T18:25:03	Introduce git_rebase_commit Commit the current patch of a rebase process.
443d5674	2014-07-17T11:59:01	git_rebase_next: write conflicts nicely during rebase
950a7091	2014-07-15T10:23:10	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.
4fe84d62	2014-07-14T15:19:19	Introduce git_rebase_abort Abort an in-progress rebase and move the working directory and repository back to the ORIG_HEAD state.
867a36f3	2014-07-14T14:35:01	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.

909d5494

2016-12-29T12:25:15

giterr_set: consistent error messages Error messages should be sentence fragments, and therefore: 1. Should not begin with a capital letter, 2. Should not conclude with punctuation, and 3. Should not end a sentence and begin a new one

f928c69a

2016-12-29T12:54:26

rebase: check the result code of rebase_init_merge

4db1fc7e

2016-12-01T23:06:41

git_rebase_init: correctly handle detached HEAD git_rebase_finish relies on head_detached being set, but rebase_init_merge was only setting it when branch->ref_name was unset. But branch->ref_name would be set to "HEAD" in the case of detached HEAD being either implicitly (NULL) or explicitly passed to git_rebase_init.

3cc5ec94

2016-10-05T12:57:53

rebase: don't ask for time sorting `git-rebase--merge` does not ask for time sorting, but uses the default. We now produce the same default time-ordered output as git, so make us of that since it's not always the same output as our time sorting.

4505a42a

2016-05-26T12:42:43

rebase: change assertion to avoid It looks like we're getting the operation and not doing anything with it, when in fact we are asserting that it's not null. Simply assert that we are within the operation boundary instead of using the `git_array_get` macro to do this for us.

9a363d1b

2016-05-03T15:29:50

rebase: handle no common ancestor for inmemory

1f84caf0

2016-04-21T18:16:37

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

badc7283

2016-04-21T17:29:19

rebase: handle detached HEADs in `init` When `init`ing a rebase from a detached HEAD, be sure to remember that we were in a detached HEAD state so that we can correctly `abort` the object that we just created.

2afb6fa4

2016-02-22T16:05:13

rebase: plug memory leak in `rebase_alloc` Convert `rebase_alloc` to use our usual error propagation patterns, that is accept an out-parameter and return an error code that is to be checked by the caller. This allows us to use the GITERR_CHECK_ALLOC macro, which helps static analysis.

f28bae0c

2016-02-15T17:16:00

rebase: persist a single in-memory index 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.

a202e0d4

2016-02-11T10:11:21

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

ee667307

2016-02-11T10:48:48

rebase: introduce inmemory rebasing Introduce the ability to rebase in-memory or in a bare repository. When `rebase_options.inmemory` is specified, the resultant `git_rebase` session will not be persisted to disk. Callers may still analyze the rebase operations, resolve any conflicts against the in-memory index and create the commits. Neither `HEAD` nor the working directory will be updated during this process.

768f8be3

2015-06-30T19:00:41

Fix #3094 - improve use of portable size_t/ssize_t format specifiers. The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c. For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.

02980bdc

2015-06-09T16:53:07

Initialize a few variables Coverity complains about the git_rawobj ones because we use a loop in which we keep remembering the old version, and we end up copying our object as the base, so we want to have the data pointer be NULL.

94c988f6

2015-04-20T17:19:08

rebase: include checkout opts within rebase opts

f3a199dd

2015-03-17T15:53:04

rebase: init and open take a rebase_options `git_rebase_init` and `git_rebase_open` should take a `git_rebase_options` and use it for future rebase operations on that `rebase` object.

5ae38538

2015-03-17T11:47:16

rebase: take `checkout_options` where appropriate

eaf0d688

2015-03-17T17:53:07

rebase: block rebase_commit with unstaged changes

30640aa9

2015-03-17T10:04:08

rebase: identify a rebase that has not started In `git_rebase_operation_current()`, indicate when a rebase has not started (with `GIT_REBASE_NO_OPERATION`) rather than conflating that with the first operation being in-progress.

fe21d708

2015-03-04T00:29:37

Plug a few leaks

23a17803

2015-01-07T14:16:50

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.

659cf202

2015-01-07T12:23:05

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.

3cbaa587

2015-02-27T04:39:54

rebase: check alloc result

a291790a

2015-02-15T05:18:01

Merge pull request #2831 from ethomson/merge_lock merge: lock index during the merge (not just checkout)

41fae48d

2015-02-03T22:31:10

indexwriter: an indexwriter for repo operations Provide git_indexwriter_init_for_operation for the common locking pattern in merge, rebase, revert and cherry-pick.

be8404a7

2015-02-03T21:51:48

merge-like operations: lock index while working

ffbd51ed

2015-02-13T11:38:00

rebase: `CHECKOUT_SAFE` instead of `FORCE` Switch to a standard branch-switching pattern of a `SAFE` checkout, then updating `HEAD`.

49b8293c

2015-02-13T11:20:32

rebase: allow `NULL` branch to indicate `HEAD` Don't require the branch to rebase, if given `NULL`, simply look up `HEAD`.

92e87dd7

2015-02-13T10:44:19

rebase: provide NULL `exec` on non-EXEC operations Users may want to try to pay attention to the `exec` field on all rebase operations.

02eb1495

2015-02-12T15:32:52

Check rebase options version on public entry points

3dbd9a0e

2014-12-24T11:43:38

Check the result of git_buf_joinpath

6f73e026

2014-12-24T11:42:50

Plug some leaks

21083a71

2014-12-06T03:12:04

notes: move the notes name argument Make it consistent between git_note_create() and git_note_remote() by putting it after the repository.

979645a7

2014-10-04T20:17:26

rebase: updates based on PR comments

18b00406

2014-10-03T19:02:29

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.

796b03bd

2014-10-03T20:47:48

rebase: clean up some warnings and memory leaks

e69737d7

2014-09-11T16:46:46

rebase: oid member of operation should be const

ed2c06a6

2014-09-11T16:47:20

git_rebase: iterators for operations

f152f8ac

2014-08-26T16:18:46

rebase: preload all operations

b6b636a7

2014-08-25T13:29:50

rebase: init/open a git_rebase object

18b439b9

2014-08-23T18:19:34

git_rebase_next: provide info about the operation

5ae9d296

2014-07-21T12:25:03

git_rebase_finish: rewrite notes when finishing rebase

a612a25f

2014-07-18T18:22:54

git_rebase_commit: write HEAD's reflog appropriately

517644cc

2014-07-18T17:19:10

Introduce git_rebase_finish to complete a rebase

93a7004c

2014-07-18T14:50:06

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.

a35a9890

2014-07-17T18:25:03

Introduce git_rebase_commit Commit the current patch of a rebase process.

443d5674

2014-07-17T11:59:01

git_rebase_next: write conflicts nicely during rebase

950a7091

2014-07-15T10:23:10

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.

4fe84d62

2014-07-14T15:19:19

Introduce git_rebase_abort Abort an in-progress rebase and move the working directory and repository back to the ORIG_HEAD state.

867a36f3

2014-07-14T14:35:01

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.

thodg/libgit2/src/rebase.c

src/rebase.c

Log