aboutsummaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
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
2023-02-22Merge branch 'ab/hook-api-with-stdin'Junio C Hamano1-14/+4
2023-02-21rebase -i: check labels and refs when parsing todo listPhillip Wood1-1/+38
2023-02-09gpg-interface: lazily initialize and read the configurationJunio C Hamano1-4/+0
2023-02-08sequencer: use the new hook API for the simpler "post-rewrite" callEmily Shaffer1-14/+4
2023-02-06sequencer.c: always free() the "msgbuf" in do_pick_commit()Ævar Arnfjörð Bjarmason1-6/+10
2023-02-06builtin/revert.c: move free-ing of "revs" to replay_opts_release()Ævar Arnfjörð Bjarmason1-0/+3
2023-02-06sequencer API users: fix get_replay_opts() leaksÆvar Arnfjörð Bjarmason1-3/+1
2023-02-06sequencer.c: split up sequencer_remove_state()Ævar Arnfjörð Bjarmason1-9/+14
2023-01-13rebase: cleanup "--exec" option handlingPhillip Wood1-2/+2
2022-12-26Merge branch 'sk/remove-duplicate-includes'Junio C Hamano1-1/+0
2022-12-15git: remove duplicate includesSeija Kijin1-1/+0
2022-12-14Merge branch 'ab/various-leak-fixes'Junio C Hamano1-0/+1
2022-12-09rebase --update-refs: avoid unintended ref deletionVictoria Dye1-3/+6
2022-11-28Merge branch 'ab/fewer-the-index-macros'Junio C Hamano1-6/+9
2022-11-23Merge branch 'pw/rebase-no-reflog-action'Junio C Hamano1-20/+25
2022-11-23Merge branch 'pw/strict-label-lookups'Junio C Hamano1-25/+28
2022-11-21sequencer.c: fix "opts->strategy" leak in read_strategy_opts()Ævar Arnfjörð Bjarmason1-0/+1
2022-11-21read-cache API & users: make discard_index() return voidÆvar Arnfjörð Bjarmason1-6/+9
2022-11-18Merge branch 'vd/skip-cache-tree-update'Taylor Blau1-0/+1
2022-11-18Merge branch 'vd/update-refs-delete'Taylor Blau1-3/+6
2022-11-10sequencer: tighten label lookupsPhillip Wood1-6/+8
2022-11-10sequencer: unify label lookupPhillip Wood1-24/+25
2022-11-10rebase: use 'skip_cache_tree_update' optionVictoria Dye1-0/+1
2022-11-09sequencer: stop exporting GIT_REFLOG_ACTIONPhillip Wood1-20/+25
2022-11-08Merge branch 'rs/no-more-run-command-v'Taylor Blau1-18/+14
2022-11-07rebase --update-refs: avoid unintended ref deletionVictoria Dye1-3/+6
2022-10-30Merge branch 'pw/rebase-reflog-fixes'Taylor Blau1-0/+5
2022-10-30replace and remove run_command_v_opt()René Scharfe1-2/+4
2022-10-30use child_process members "args" and "env" directlyRené Scharfe1-15/+10
2022-10-30sequencer: simplify building argument list in do_exec()René Scharfe1-2/+1
2022-10-25Merge branch 'jk/sequencer-missing-author-name-check' into maint-2.38Junio C Hamano1-1/+1
2022-10-25Merge branch 'ja/rebase-i-avoid-amending-self' into maint-2.38Junio C Hamano1-2/+2
2022-10-17rebase --merge: fix reflog when continuingPhillip Wood1-0/+5
2022-10-11Merge branch 'jk/sequencer-missing-author-name-check'Junio C Hamano1-1/+1
2022-10-10Merge branch 'ja/rebase-i-avoid-amending-self'Junio C Hamano1-2/+2
2022-10-03sequencer: detect author name errors in read_author_script()Jeff King1-1/+1
2022-09-26sequencer: avoid dropping fixup commit that targets self via commit-ishJohannes Altmanninger1-2/+2
2022-09-14Merge branch 'ab/unused-annotation'Junio C Hamano1-2/+2
2022-09-14Merge branch 'jk/unused-annotation'Junio C Hamano1-2/+3
2022-09-01git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason1-2/+2
2022-08-19sequencer: do not translate command namesMichael J Gruber1-2/+2
2022-08-19sequencer: do not translate parameters to error_resolve_conflict()Michael J Gruber1-2/+2
2022-08-19sequencer: do not translate reflog messagesMichael J Gruber1-1/+1
2022-08-19hashmap: mark unused callback parametersJeff King1-2/+3
2022-07-19sequencer: notify user of --update-refs activityDerrick Stolee1-6/+34
2022-07-19sequencer: ignore HEAD ref under --update-refsDerrick Stolee1-0/+13
2022-07-19sequencer: rewrite update-refs as user edits todo listDerrick Stolee1-0/+96
2022-07-19rebase: update refs from 'update-ref' commandsDerrick Stolee1-3/+117
2022-07-19rebase: add --update-refs optionDerrick Stolee1-0/+107
2022-07-19sequencer: add update-ref commandDerrick Stolee1-1/+13
2022-07-19sequencer: define array with enum valuesDerrick Stolee1-14/+14
2022-07-19branch: consider refs under 'update-refs'Derrick Stolee1-0/+74
2022-06-15Merge branch 'jc/revert-show-parent-info'Junio C Hamano1-5/+28
2022-06-10Merge branch 'ab/env-array'Junio C Hamano1-9/+9
2022-06-08Merge branch 'rs/commit-summary-wo-break-rewrite' into maintJunio C Hamano1-1/+0
2022-06-07Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano1-7/+19
2022-06-02run-command API users: use "env" not "env_array" in comments & namesÆvar Arnfjörð Bjarmason1-3/+3
2022-06-02run-command API: rename "env_array" to "env"Ævar Arnfjörð Bjarmason1-8/+8
2022-05-31revert: --reference should apply only to 'revert', not 'cherry-pick'Junio C Hamano1-1/+1
2022-05-26revert: optionally refer to commit in the "reference" formatJunio C Hamano1-5/+28
2022-05-11Merge branch 'rs/commit-summary-wo-break-rewrite'Junio C Hamano1-1/+0
2022-04-13revisions API users: add "goto cleanup" for release_revisions()Ævar Arnfjörð Bjarmason1-7/+16
2022-04-13revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason1-0/+3
2022-04-13Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'"Junio C Hamano1-1/+1
2022-04-06commit, sequencer: turn off break_opt for commit summaryRené Scharfe1-1/+0
2022-03-23Merge branch 'js/in-place-reverse-in-sequencer'Junio C Hamano1-6/+4
2022-03-16sequencer: use reverse_commit_list() helperJayati Shrivastava1-6/+4
2022-03-07hooks: fix an obscure TOCTOU "did we just run a hook?" raceÆvar Arnfjörð Bjarmason1-2/+2
2022-02-25Merge branch 'ja/i18n-common-messages'Junio C Hamano1-1/+1
2022-02-18Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'Junio C Hamano1-1/+1
2022-02-18Merge branch 'pw/use-in-process-checkout-in-rebase'Junio C Hamano1-38/+14
2022-02-11Merge branch 'ab/no-errno-from-resolve-ref-unsafe'Junio C Hamano1-7/+3
2022-02-04i18n: factorize "invalid value" messagesJean-Noël Avila1-1/+1
2022-01-28Merge branch 'en/keep-cwd' into maintJunio C Hamano1-1/+4
2022-01-26Merge branch 'en/keep-cwd'Junio C Hamano1-1/+4
2022-01-26refs API: remove "failure_errno" from refs_resolve_ref_unsafe()Ævar Arnfjörð Bjarmason1-3/+1
2022-01-26sequencer: don't use die_errno() on refs_resolve_ref_unsafe() failureÆvar Arnfjörð Bjarmason1-6/+4
2022-01-26rebase -m: don't fork git checkoutPhillip Wood1-27/+11
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 09:54:18 +0000