diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2026-07-15 16:22:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-07-15 12:16:21 -0700 |
| commit | a7dbb3a462eab29d5ca79c9cba175e0baeff6751 (patch) | |
| tree | 5dd97942acba1a482409e309477743ee04b1c53d /t/t4013/diff.diff_initial..side | |
| parent | 034deee6c7630fad36ce2db5b9d1ab4afd78a09e (diff) | |
sequencer: use an enum to represent result of picking a commit
Rather than using an integer where -1 is an error, 0 is success and 1
indicates there were conflicts, use an enum. This is clearer and lets
us add a separate return value for commits that are dropped because
they become empty in the next commit.
Note we continue to use "return error(...)" to return errors and
take advantage of C's lax typing of enums
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions
