summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling'Junio C Hamano2023-04-171-32/+26
|\
| * rebase -m: fix serialization of strategy optionsPhillip Wood2023-04-101-5/+6
| * rebase -m: cleanup --strategy-option handlingPhillip Wood2023-04-101-1/+1
| * sequencer: use struct strvec to store merge strategy optionsPhillip Wood2023-04-101-27/+21
| * rebase: stop reading and writing unnecessary strategy statePhillip Wood2023-04-101-1/+0
* | Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-0/+4
|\ \
| * | wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren2023-03-211-0/+1
| * | abspath.h: move absolute path functions from cache.hElijah Newren2023-03-211-0/+1
| * | environment: move comment_line_char from cache.hElijah Newren2023-03-211-0/+1
| * | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
| |/
* | Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano2023-04-061-65/+85
|\ \
| * | libs: use "struct repository *" argument, not "the_repository"Ævar Arnfjörð Bjarmason2023-03-281-54/+48
| * | post-cocci: adjust comments for recent repo_* migrationÆvar Arnfjörð Bjarmason2023-03-281-3/+3
| * | cocci: apply the "pretty.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-4/+8
| * | cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-32/+50
| * | cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+2
| * | cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-24/+27
* | | Merge branch 'ob/sequencer-save-head-simplify'Junio C Hamano2023-04-041-19/+1
|\ \ \
| * | | sequencer: rewrite save_head() in terms of write_message()Oswald Buddenhagen2023-03-241-19/+1
| |/ /
* | | Merge branch 'ob/rollback-after-commit-lock-failure'Junio C Hamano2023-04-041-1/+0
|\ \ \ | |_|/ |/| |
| * | sequencer: remove pointless rollback_lock_file()Oswald Buddenhagen2023-03-241-1/+0
* | | Merge branch 'ab/fix-strategy-opts-parsing'Junio C Hamano2023-03-191-2/+7
|\ \ \
| * | | sequencer.c: fix overflow & segfault in parse_strategy_opts()Ævar Arnfjörð Bjarmason2023-03-081-2/+7
* | | | Merge branch 'jc/gpg-lazy-init'Junio C Hamano2023-03-171-4/+0
|\ \ \ \
| * | | | gpg-interface: lazily initialize and read the configurationJunio C Hamano2023-02-091-4/+0
* | | | | Merge branch 'en/header-cleanup'Junio C Hamano2023-03-171-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-231-0/+1
| * | | | alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren2023-02-231-0/+1
* | | | | Merge branch 'pw/rebase-i-parse-fix'Junio C Hamano2023-02-281-10/+8
|\ \ \ \ \
| * | | | | rebase -i: fix parsing of "fixup -C<commit>"Phillip Wood2023-02-231-4/+2
| * | | | | rebase -i: match whole word in is_command()Phillip Wood2023-02-231-6/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'pw/rebase-i-validate-labels-early'Junio C Hamano2023-02-271-1/+38
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | rebase -i: check labels and refs when parsing todo listPhillip Wood2023-02-211-1/+38
* | | | | Merge branch 'ab/hook-api-with-stdin'Junio C Hamano2023-02-221-14/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | sequencer: use the new hook API for the simpler "post-rewrite" callEmily Shaffer2023-02-081-14/+4
| | |/ / | |/| |
* | | | sequencer.c: always free() the "msgbuf" in do_pick_commit()Ævar Arnfjörð Bjarmason2023-02-061-6/+10
* | | | builtin/revert.c: move free-ing of "revs" to replay_opts_release()Ævar Arnfjörð Bjarmason2023-02-061-0/+3
* | | | sequencer API users: fix get_replay_opts() leaksÆvar Arnfjörð Bjarmason2023-02-061-3/+1
* | | | sequencer.c: split up sequencer_remove_state()Ævar Arnfjörð Bjarmason2023-02-061-9/+14
|/ / /
* | | rebase: cleanup "--exec" option handlingPhillip Wood2023-01-131-2/+2
* | | Merge branch 'sk/remove-duplicate-includes'Junio C Hamano2022-12-261-1/+0
|\ \ \ | |/ /
| * | git: remove duplicate includesSeija Kijin2022-12-151-1/+0
* | | Merge branch 'ab/various-leak-fixes'Junio C Hamano2022-12-141-0/+1
|\ \ \ | |/ / |/| |
| * | sequencer.c: fix "opts->strategy" leak in read_strategy_opts()Ævar Arnfjörð Bjarmason2022-11-211-0/+1
* | | Merge branch 'ab/fewer-the-index-macros'Junio C Hamano2022-11-281-6/+9
|\ \ \
| * | | read-cache API & users: make discard_index() return voidÆvar Arnfjörð Bjarmason2022-11-211-6/+9
* | | | Merge branch 'pw/rebase-no-reflog-action'Junio C Hamano2022-11-231-20/+25
|\ \ \ \ | | |/ / | |/| |
| * | | sequencer: stop exporting GIT_REFLOG_ACTIONPhillip Wood2022-11-091-20/+25
* | | | Merge branch 'pw/strict-label-lookups'Junio C Hamano2022-11-231-25/+28
|\ \ \ \ | |_|/ / |/| | |
| * | | sequencer: tighten label lookupsPhillip Wood2022-11-101-6/+8
View Lorry Controller Status