aboutsummaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2025-09-29Merge branch 'jk/setup-revisions-freefix'Junio C Hamano1-3/+4
2025-09-29Merge branch 'pw/rebase-i-cleanup-fix'Junio C Hamano1-12/+0
2025-09-22treewide: pass strvecs around for setup_revisions_from_strvec()Jeff King1-3/+4
2025-09-18sequencer: remove VERBATIM_MSG flagPhillip Wood1-11/+0
2025-09-18rebase -i: respect commit.cleanup when picking fixupsPhillip Wood1-1/+0
2025-08-21Merge branch 'js/rebase-i-allow-drop-on-a-merge'Junio C Hamano1-0/+1
2025-08-06rebase -i: permit 'drop' of a merge commitJohannes Sixt1-0/+1
2025-07-23config: drop `git_config_set_multivar_in_file_gently()` wrapperPatrick Steinhardt1-1/+1
2025-07-23config: drop `git_config_set_in_file_gently()` wrapperPatrick Steinhardt1-14/+14
2025-07-23config: drop `git_config_get_int()` wrapperPatrick Steinhardt1-1/+1
2025-07-23config: drop `git_config_get_string()` wrapperPatrick Steinhardt1-1/+1
2025-07-23config: drop `git_config()` wrapperPatrick Steinhardt1-1/+1
2025-07-15Merge branch 'ps/object-store'Junio C Hamano1-4/+3
2025-07-01odb: rename `oid_object_info()`Patrick Steinhardt1-3/+2
2025-07-01object-store: rename files to "odb.{c,h}"Patrick Steinhardt1-1/+1
2025-06-03sequencer: replace error() with BUG() in update_squash_messages ()Lidong Yan1-2/+4
2025-05-27Merge branch 'en/sequencer-comment-messages'Junio C Hamano1-5/+11
2025-05-27Merge branch 'js/misc-fixes'Junio C Hamano1-3/+6
2025-05-27Merge branch 'ly/sequencer-rearrange-leakfix'Junio C Hamano1-3/+5
2025-05-19Merge branch 'jk/oidmap-cleanup'Junio C Hamano1-2/+2
2025-05-19Merge branch 'pw/sequencer-reflog-use-after-free'Junio C Hamano1-59/+57
2025-05-16sequencer: make it clearer that commit descriptions are just commentsElijah Newren1-5/+11
2025-05-15sequencer: fix memory leak if `todo_list_rearrange_squash()` failedLidong Yan1-3/+5
2025-05-15sequencer: stop pretending that an assignment is a conditionJohannes Schindelin1-3/+6
2025-05-12oidmap: rename oidmap_free() to oidmap_clear()Jeff King1-2/+2
2025-05-09sequencer: rework reflog message handlingPhillip Wood1-26/+24
2025-05-09sequencer: move reflog message functionsPhillip Wood1-33/+33
2025-04-24Merge branch 'ps/object-file-cleanup'Junio C Hamano1-3/+3
2025-04-17Merge branch 'en/merge-recursive-debug'Junio C Hamano1-37/+21
2025-04-15Merge branch 'ps/object-wo-the-repository'Junio C Hamano1-5/+5
2025-04-15object-store: merge "object-store-ll.h" and "object-store.h"Patrick Steinhardt1-1/+1
2025-04-15object-file: move `safe_create_leading_directories()` into "path.c"Patrick Steinhardt1-2/+2
2025-04-08merge, sequencer: switch recursive merges over to ortElijah Newren1-15/+8
2025-04-08sequencer: switch non-recursive merges over to ortElijah Newren1-22/+13
2025-03-21treewide: replace assert() with ASSERT() in special casesElijah Newren1-1/+1
2025-03-10hash: stop depending on `the_repository` in `null_oid()`Patrick Steinhardt1-5/+5
2025-02-11rebase -i: reword empty commit after fast-forwardPhillip Wood1-3/+9
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+1
2024-12-06Merge branch 'kh/sequencer-comment-char'Junio C Hamano1-10/+16
2024-11-26sequencer: comment commit messages properlyKristoffer Haugsbakk1-4/+8
2024-11-26sequencer: comment `--reference` subject line properlyKristoffer Haugsbakk1-4/+5
2024-11-26sequencer: comment checked-out branch properlyKristoffer Haugsbakk1-2/+3
2024-11-21refs: allow passing flags when setting up a transactionPatrick Steinhardt1-3/+3
2024-10-09rebase-merges: try and use branch names as labelsNicolas Guichard1-8/+17
2024-10-09rebase-update-refs: extract load_branch_decorationsNicolas Guichard1-10/+1
2024-08-28Merge branch 'mt/rebase-x-quiet'Junio C Hamano1-3/+4
2024-08-23Merge branch 'ps/config-wo-the-repository'Junio C Hamano1-3/+3
2024-08-21rebase --exec: respect --quietMatheus Tavares1-3/+4
2024-08-14sequencer: release todo list on error pathsPatrick Steinhardt1-19/+47
2024-08-14builtin/rebase: fix leaking `commit.gpgsign` valuePatrick Steinhardt1-0/+1
2024-08-13hooks: remove implicit dependency on `the_repository`Patrick Steinhardt1-3/+3
2024-07-13merge-recursive: honor diff.algorithmAntonin Delpeuch1-2/+2
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano1-38/+78
2024-07-02Merge branch 'ps/use-the-repository'Junio C Hamano1-3/+5
2024-06-20Merge branch 'pw/rebase-i-error-message'Junio C Hamano1-11/+72
2024-06-14global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt1-0/+2
2024-06-14hash: require hash algorithm in `empty_tree_oid_hex()`Patrick Steinhardt1-1/+1
2024-06-14hash: require hash algorithm in `oidread()` and `oidclr()`Patrick Steinhardt1-2/+2
2024-06-11merge: fix leaking merge basesPatrick Steinhardt1-0/+1
2024-06-11sequencer: fix memory leaks in `make_script_with_merges()`Patrick Steinhardt1-0/+3
2024-06-11sequencer: fix leaking string buffer in `commit_staged_changes()`Patrick Steinhardt1-38/+73
2024-06-11commit: fix leaking parents when calling `commit_tree_extended()`Patrick Steinhardt1-0/+1
2024-06-06Merge branch 'ps/leakfixes'Junio C Hamano1-1/+1
2024-06-03Merge branch 'ps/leakfixes' into ps/leakfixes-moreJunio C Hamano1-1/+1
2024-05-30rebase -i: improve error message when picking mergePhillip Wood1-2/+61
2024-05-30rebase -i: pass struct replay_opts to parse_insn_line()Phillip Wood1-10/+12
2024-05-27config: clarify memory ownership in `git_config_string()`Patrick Steinhardt1-1/+1
2024-05-23Merge branch 'la/hide-trailer-info'Junio C Hamano1-15/+12
2024-05-20Merge branch 'kn/ref-transaction-symref'Junio C Hamano1-5/+6
2024-05-07cocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt1-28/+33
2024-05-07refs: accept symref values in `ref_transaction_update()`Karthik Nayak1-4/+5
2024-05-02sequencer: use the trailer iteratorLinus Arver1-15/+12
2024-04-30Merge branch 'pw/rebase-m-signoff-fix'Junio C Hamano1-92/+158
2024-04-18rebase -m: fix --signoff with conflictsPhillip Wood1-6/+17
2024-04-18sequencer: store commit message in private contextPhillip Wood1-46/+50
2024-04-18sequencer: move current fixups to private contextPhillip Wood1-32/+57
2024-04-18sequencer: start removing private fields from public APIPhillip Wood1-6/+30
2024-04-18sequencer: always free "struct replay_opts"Phillip Wood1-2/+4
2024-04-05Merge branch 'jk/core-comment-string'Junio C Hamano1-23/+25
2024-04-05Merge branch 'rs/config-comment'Junio C Hamano1-15/+15
2024-04-03Merge branch 'bl/cherry-pick-empty'Junio C Hamano1-31/+41
2024-04-01Merge branch 'pb/advice-merge-conflict'Junio C Hamano1-15/+18
2024-03-25cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles1-0/+6
2024-03-25sequencer: do not require `allow_empty` for redundant commit optionsBrian Lyles1-16/+7
2024-03-25sequencer: handle unborn branch with `--allow-empty`Brian Lyles1-15/+28
2024-03-18Merge branch 'pw/rebase-i-ignore-cherry-pick-help-environment'Junio C Hamano1-1/+13
2024-03-18sequencer: allow disabling conflict advicePhilippe Blain1-15/+18
2024-03-15config: add --comment option to add a commentRalph Seichter1-14/+14
2024-03-14Merge branch 'la/trailer-api'Junio C Hamano1-1/+1
2024-03-12sequencer: handle multi-byte comment characters when writing todo listJeff King1-1/+3
2024-03-12find multi-byte comment chars in unterminated buffersJeff King1-2/+2
2024-03-12find multi-byte comment chars in NUL-terminated stringsJeff King1-1/+1
2024-03-12prefer comment_line_str to comment_line_char for printingJeff King1-10/+10
2024-03-12strbuf: accept a comment string for strbuf_add_commented_lines()Jeff King1-4/+4
2024-03-12strbuf: accept a comment string for strbuf_commented_addf()Jeff King1-2/+2
2024-03-12strbuf: accept a comment string for strbuf_stripspace()Jeff King1-3/+3
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano1-2/+6
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano1-0/+4
2024-03-01trailer_info_get(): reorder parametersLinus Arver1-1/+1
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-2/+6
2024-02-27rebase -i: stop setting GIT_CHERRY_PICK_HELPPhillip Wood1-1/+13
2024-02-23Always check `parse_tree*()`'s return valueJohannes Schindelin1-0/+4
2024-02-14Merge branch 'vn/rebase-with-cherry-pick-authorship'Junio C Hamano1-0/+1
2024-02-08sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commandsVegard Nossum1-0/+1
2024-01-19sequencer: introduce functions to handle autostashes via refsPatrick Steinhardt1-5/+61
2024-01-19refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt1-4/+8
2024-01-19sequencer: delete REBASE_HEAD in correct repo when picking commitsPatrick Steinhardt1-1/+2
2024-01-19sequencer: clean up pseudo refs with REF_NO_DEREFPatrick Steinhardt1-7/+7
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano1-3/+0
2024-01-02Merge branch 'la/trailer-cleanups'Junio C Hamano1-1/+1
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-3/+0
2023-12-20trailer: use offsets for trailer_start/trailer_endLinus Arver1-1/+1
2023-12-09sequencer: simplify away extra git_config_string() callJeff King1-13/+8
2023-09-20Merge branch 'ob/sequencer-remove-dead-code'Junio C Hamano1-4/+0
2023-09-14Merge branch 'pw/rebase-i-after-failure'Junio C Hamano1-83/+99
2023-09-14Merge branch 'ob/revert-of-revert-is-reapply'Junio C Hamano1-0/+11
2023-09-13Merge branch 'ob/sequencer-reword-error-message'Junio C Hamano1-1/+1
2023-09-12sequencer: remove unreachable exit condition in pick_commits()Oswald Buddenhagen1-4/+0
2023-09-07Merge branch 'jk/unused-post-2.42'Junio C Hamano1-13/+14
2023-09-06rebase -i: fix adding failed command to the todo listPhillip Wood1-6/+6
2023-09-06rebase --continue: refuse to commit after failed commandPhillip Wood1-0/+5
2023-09-06rebase: fix rewritten list for failed pickPhillip Wood1-12/+7
2023-09-06sequencer: factor out part of pick_commits()Phillip Wood1-61/+71
2023-09-06sequencer: use rebase_path_message()Phillip Wood1-5/+2
2023-09-06rebase -i: remove patch file after conflict resolutionPhillip Wood1-4/+12
2023-09-06rebase -i: move unlink() callsPhillip Wood1-3/+4
2023-09-05sequencer: fix error message on failure to copy SQUASH_MSGOswald Buddenhagen1-1/+1
2023-09-02sequencer: beautify subject of reverts of revertsOswald Buddenhagen1-0/+11
2023-08-31Merge branch 'ob/sequencer-empty-hint-fix'Junio C Hamano1-1/+1
2023-08-29sequencer: mark repository argument as unusedJeff King1-1/+1
2023-08-29sequencer: use repository parameter in short_commit_name()Jeff King1-12/+13
2023-08-24Merge branch 'mp/rebase-label-length-limit'Junio C Hamano1-6/+41
2023-08-24Merge branch 'ob/sequencer-rearrange-cleanup'Junio C Hamano1-4/+5
2023-08-24sequencer: rectify empty hint in call of require_clean_work_tree()Oswald Buddenhagen1-1/+1
2023-08-10rebase: allow overriding the maximal length of the generated labelsJohannes Schindelin1-2/+6
2023-08-10sequencer: truncate labels to accommodate loose refsMark Ruvald Pedersen1-5/+36
2023-08-09Merge branch 'pw/rebase-skip-commit-message-fix'Junio C Hamano1-7/+19
2023-08-09sequencer: simplify allocation of result array in todo_list_rearrange_squash()Oswald Buddenhagen1-4/+5
2023-08-03rebase --skip: fix commit message clean up when skipping squashPhillip Wood1-7/+19
2023-08-02Merge branch 'ah/sequencer-rewrite-todo-fix'Junio C Hamano1-1/+1
2023-07-24sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie1-1/+1
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano1-2/+0
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-13/+16
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano1-9/+15
2023-07-05git-compat-util: move alloc macros to git-compat-util.hCalvin Wan1-1/+0
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-28config: pass kvi to die_bad_number()Glen Choo1-11/+11
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-3/+6
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+1
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+1
2023-06-21merge.h: move declarations for merge.c from cache.hElijah Newren1-0/+1
2023-06-21sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren1-0/+1
2023-06-12strbuf: remove global variableCalvin Wan1-9/+15
2023-05-20Merge branch 'js/rebase-count-fixes'Junio C Hamano1-5/+8
2023-05-14rebase -r: fix the total number shown in the progressJohannes Schindelin1-3/+6
2023-05-14rebase --update-refs: fix loopsJohannes Schindelin1-2/+2
2023-05-09Merge branch 'ob/messages-capitalize-exception'Junio C Hamano1-2/+2
2023-05-09Merge branch 'ob/sequencer-i18n-fix'Junio C Hamano1-1/+1
2023-05-09Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano1-0/+1
2023-04-28messages: capitalization and punctuation exceptionsOswald Buddenhagen1-2/+2
2023-04-28sequencer: actually translate report in do_exec()Oswald Buddenhagen1-1/+1
2023-04-25Merge branch 'en/header-split-cache-h'Junio C Hamano1-0/+4
2023-04-24copy.h: move declarations for copy.c functions from cache.hElijah Newren1-0/+1
2023-04-17Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling'Junio C Hamano1-32/+26
2023-04-11pager.h: move declarations for pager.c functions from cache.hElijah Newren1-0/+1
2023-04-11object-file.h: move declarations for object-file.c functions from cache.hElijah Newren1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren1-0/+1
2023-04-10rebase -m: fix serialization of strategy optionsPhillip Wood1-5/+6
2023-04-10rebase -m: cleanup --strategy-option handlingPhillip Wood1-1/+1
2023-04-10sequencer: use struct strvec to store merge strategy optionsPhillip Wood1-27/+21
2023-04-10rebase: stop reading and writing unnecessary strategy statePhillip Wood1-1/+0
2023-04-06Merge branch 'en/header-split-cleanup'Junio C Hamano1-0/+4
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano1-65/+85
2023-04-04Merge branch 'ob/sequencer-save-head-simplify'Junio C Hamano1-19/+1
2023-04-04Merge branch 'ob/rollback-after-commit-lock-failure'Junio C Hamano1-1/+0
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-65/+85
2023-03-28libs: use "struct repository *" argument, not "the_repository"Ævar Arnfjörð Bjarmason1-54/+48
2023-03-28post-cocci: adjust comments for recent repo_* migrationÆvar Arnfjörð Bjarmason1-3/+3
2023-03-28cocci: apply the "pretty.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-4/+8
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-32/+50
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+2
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-24/+27
2023-03-24sequencer: rewrite save_head() in terms of write_message()Oswald Buddenhagen1-19/+1
2023-03-24sequencer: remove pointless rollback_lock_file()Oswald Buddenhagen1-1/+0
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren1-0/+1
2023-03-21abspath.h: move absolute path functions from cache.hElijah Newren1-0/+1
2023-03-21environment: move comment_line_char from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-03-19Merge branch 'ab/fix-strategy-opts-parsing'Junio C Hamano1-2/+7
2023-03-17Merge branch 'jc/gpg-lazy-init'Junio C Hamano1-4/+0
2023-03-17Merge branch 'en/header-cleanup'Junio C Hamano1-0/+2
2023-03-08sequencer.c: fix overflow & segfault in parse_strategy_opts()Ævar Arnfjörð Bjarmason1-2/+7
2023-02-28Merge branch 'pw/rebase-i-parse-fix'Junio C Hamano1-10/+8
2023-02-27Merge branch 'pw/rebase-i-validate-labels-early'Junio C Hamano1-1/+38
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2023-02-23alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren1-0/+1
2023-02-23rebase -i: fix parsing of "fixup -C<commit>"Phillip Wood1-4/+2
2023-02-23rebase -i: match whole word in is_command()Phillip Wood1-6/+6