aboutsummaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2018-05-18path.c: migrate global git_path_* to take a repository argumentStefan Beller1-18/+19
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-04-26cache.h: add repository argument to oid_object_infoStefan Beller1-1/+2
2018-04-10Merge branch 'bc/object-id'Junio C Hamano1-4/+5
2018-03-21Merge branch 'ma/skip-writing-unchanged-index'Junio C Hamano1-6/+5
2018-03-14Merge branch 'ma/roll-back-lockfiles'Junio C Hamano1-18/+14
2018-03-14sha1_file: convert sha1_object_info* to object_idbrian m. carlson1-1/+2
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson1-1/+1
2018-03-14cache-tree: convert write_*_as_tree to object_idbrian m. carlson1-2/+2
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano1-1/+1
2018-03-06Merge branch 'rs/strbuf-read-file-or-whine'Junio C Hamano1-46/+28
2018-03-06Merge branch 'nd/rebase-show-current-patch'Junio C Hamano1-0/+4
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexMartin Ågren1-6/+5
2018-02-28sequencer: do not roll back lockfile unnecessarilyMartin Ågren1-12/+6
2018-02-27sequencer: always roll back lock in `do_recursive_merge()`Martin Ågren1-1/+3
2018-02-27sequencer: make lockfiles non-staticMartin Ågren1-5/+5
2018-02-22sequencer: factor out strbuf_read_file_or_whine()René Scharfe1-46/+28
2018-02-15Merge branch 'po/object-id'Junio C Hamano1-2/+2
2018-02-14object: rename function 'typename' to 'type_name'Brandon Williams1-1/+1
2018-02-13Merge branch 'pw/sequencer-in-process-commit'Junio C Hamano1-8/+530
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy1-0/+4
2018-01-24sequencer: run 'prepare-commit-msg' hookPhillip Wood1-13/+56
2017-12-27sequencer: do not invent whitespace when transforming OIDsJohannes Schindelin1-1/+4
2017-12-27sequencer: report when noop has an argumentJohannes Schindelin1-4/+9
2017-12-27sequencer: remove superfluous conditionalJohannes Schindelin1-3/+1
2017-12-27sequencer: strip bogus LF at end of error messagesJohannes Schindelin1-4/+4
2017-12-27Merge branch 'lb/rebase-i-short-command-names'Junio C Hamano1-43/+83
2017-12-27sequencer.c: drop 'const' from function return typeJunio C Hamano1-1/+1
2017-12-22sequencer: assign only free()able strings to gpg_signJohannes Schindelin1-1/+1
2017-12-19Merge branch 'en/rename-progress'Junio C Hamano1-0/+2
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano1-3/+3
2017-12-13sequencer: improve config handlingPhillip Wood1-39/+48
2017-12-05rebase -i: learn to abbreviate command namesLiam Beguin1-2/+14
2017-12-05rebase -i -x: add exec commands via the rebase--helperLiam Beguin1-0/+39
2017-12-05rebase -i: update functions to use a flags parameterLiam Beguin1-4/+5
2017-12-05rebase -i: refactor transform_todo_idsLiam Beguin1-41/+28
2017-12-04rebase -i: set commit to null in exec commandsLiam Beguin1-0/+1
2017-11-27Merge branch 'pw/sequencer-recover-from-unlockable-index'Junio C Hamano1-1/+2
2017-11-24sequencer: try to commit without forking 'git commit'Phillip Wood1-2/+176
2017-11-24sequencer: load commit related configPhillip Wood1-0/+34
2017-11-24sequencer: simplify adding Signed-off-by: trailerPhillip Wood1-5/+3
2017-11-24commit: move print_commit_summary() to libgitPhillip Wood1-0/+119
2017-11-18commit: move post-rewrite code to libgitPhillip Wood1-0/+47
2017-11-18Add a function to update HEAD after creating a commitPhillip Wood1-1/+38
2017-11-16sequencer: reschedule pick if index can't be lockedPhillip Wood1-1/+2
2017-11-15sequencer: show rename progress during cherry picksElijah Newren1-0/+1
2017-11-15Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano1-3/+3
2017-11-15Merge branch 'rs/sequencer-rewrite-file-cleanup'Junio C Hamano1-29/+16
2017-11-15Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano1-1/+6
2017-11-14sequencer: warn when internal merge may be suboptimal due to renameLimitElijah Newren1-0/+1
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson1-3/+3
2017-11-11commit: move empty message checks to libgitPhillip Wood1-0/+61
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano1-2/+3
2017-11-06Merge branch 'bc/object-id'Junio C Hamano1-7/+7
2017-11-06Merge branch 'jk/rebase-i-exec-gitdir-fix'Junio C Hamano1-1/+6
2017-11-06Merge branch 'ma/lockfile-fixes'Junio C Hamano1-1/+0
2017-11-06refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty1-3/+3
2017-11-02sequencer.c: check return value of close() in rewrite_file()Simon Ruderich1-1/+2
2017-11-02sequencer: pass absolute GIT_DIR to exec commandsJacob Keller1-1/+6
2017-11-01diff: convert flags to be stored in bitfieldsBrandon Williams1-2/+3
2017-11-01sequencer: use O_TRUNC to truncate filesRené Scharfe1-3/+1
2017-11-01sequencer: factor out rewrite_file()René Scharfe1-29/+17
2017-10-28Merge branch 'bc/object-id' into baseMichael Haggerty1-7/+7
2017-10-18Merge branch 'js/rebase-i-final'Junio C Hamano1-1/+1
2017-10-18sequencer.c: unify an error messageRalf Thielow1-1/+1
2017-10-17Merge branch 'js/rebase-i-final'Junio C Hamano1-2/+2
2017-10-16refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson1-1/+1
2017-10-16refs: convert read_ref and read_ref_full to object_idbrian m. carlson1-1/+1
2017-10-16refs: update ref transactions to use struct object_idbrian m. carlson1-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson1-4/+4
2017-10-16sequencer.c: fix and unify error messages in rearrange_squash()Ralf Thielow1-2/+2
2017-10-09Merge branch 'js/rebase-i-final'Junio C Hamano1-1/+1
2017-10-09i18n: add a missing space in messageJean-Noel Avila1-1/+1
2017-10-07read-cache: leave lock in right state in `write_locked_index()`Martin Ågren1-1/+0
2017-10-05Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano1-1/+1
2017-10-03Merge branch 'js/rebase-i-final'Junio C Hamano1-0/+531
2017-10-02use strbuf_addstr() for adding strings to strbufsRené Scharfe1-1/+1
2017-09-07sequencer: release strbuf after use in save_head()Rene Scharfe1-1/+4
2017-08-22Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano1-1/+19
2017-08-02cherry-pick/revert: remember --rerere-autoupdatePhillip Wood1-1/+9
2017-08-02rebase -i: honor --rerere-autoupdatePhillip Wood1-0/+10
2017-07-27rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin1-0/+196
2017-07-27rebase -i: skip unnecessary picks using the rebase--helperJohannes Schindelin1-0/+107
2017-07-27rebase -i: check for missing commits in the rebase--helperJohannes Schindelin1-0/+122
2017-07-27rebase -i: also expand/collapse the SHA-1s via the rebase--helperJohannes Schindelin1-0/+57
2017-07-27rebase -i: generate the script via rebase--helperJohannes Schindelin1-0/+49
2017-07-17sha1_name: convert get_sha1* to get_oid*brian m. carlson1-3/+3
2017-07-17sequencer: convert to struct object_idbrian m. carlson1-29/+30
2017-06-30Merge branch 'pw/rebase-i-regression-fix-tests'Junio C Hamano1-5/+6
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano1-2/+1
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-19Merge branch 'bw/object-id'Junio C Hamano1-2/+2
2017-06-19sequencer: print autostash messages to stderrJohannes Schindelin1-5/+6
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason1-2/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano1-4/+4
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams1-2/+2
2017-06-04Merge branch 'ab/c-translators-comment-style'Junio C Hamano1-1/+2
2017-05-31C style: use standard style for "TRANSLATORS" commentsÆvar Arnfjörð Bjarmason1-1/+2
2017-05-29Merge branch 'pw/rebase-i-regression-fix'Junio C Hamano1-1/+4
2017-05-29Merge branch 'bc/object-id'Junio C Hamano1-29/+30
2017-05-26wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy1-4/+4
2017-05-20rebase -i: add missing newline to end of messagePhillip Wood1-1/+1
2017-05-20rebase -i: silence stash applyPhillip Wood1-0/+2
2017-05-20rebase -i: fix reflog messagePhillip Wood1-0/+1
2017-05-16Merge branch 'jt/use-trailer-api-in-commands'Junio C Hamano1-7/+4
2017-05-08tree: convert parse_tree_indirect to struct object_idbrian m. carlson1-1/+1
2017-05-08sequencer: convert do_recursive_merge to struct object_idbrian m. carlson1-3/+3
2017-05-08merge: convert checkout_fast_forward to struct object_idbrian m. carlson1-1/+1
2017-05-08sequencer: convert fast_forward_to to struct object_idbrian m. carlson1-11/+11
2017-05-08Convert lookup_tree to struct object_idbrian m. carlson1-1/+1
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-4/+4
2017-05-08Convert remaining callers of lookup_commit_reference* to object_idbrian m. carlson1-10/+10
2017-05-08sequencer: convert some functions to struct object_idbrian m. carlson1-6/+6
2017-05-02Convert struct cache_tree to use struct object_idbrian m. carlson1-1/+2
2017-05-01Merge branch 'sh/rebase-i-reread-todo-after-exec'Junio C Hamano1-0/+22
2017-04-27rebase -i: reread the todo list if `exec` touched itStephen Hicks1-0/+22
2017-04-26sequencer: add newline before adding footersJonathan Tan1-7/+4
2017-04-26Merge branch 'jk/war-on-git-path'Junio C Hamano1-6/+6
2017-04-20use git_path_* helper functionsJeff King1-6/+6
2017-03-30Merge branch 'js/rebase-i-reword-to-run-hooks'Junio C Hamano1-23/+31
2017-03-27sequencer: allow the commit-msg hooks to run during a `reword`Johannes Schindelin1-2/+6
2017-03-27sequencer: make commit options more extensibleJohannes Schindelin1-22/+26
2017-03-23sequencer: fix missing newlineBrandon Williams1-1/+1
2017-03-17sequencer: drop "warning:" when stopping for editJeff King1-1/+2
2017-01-17sequencer (rebase -i): write out the final messageJohannes Schindelin1-0/+3
2017-01-17sequencer (rebase -i): write the progress into filesJohannes Schindelin1-3/+27
2017-01-17sequencer (rebase -i): show the progressJohannes Schindelin1-0/+32
2017-01-17sequencer (rebase -i): suggest --edit-todo upon unknown commandJohannes Schindelin1-1/+5
2017-01-17sequencer (rebase -i): show only failed cherry-picks' outputJohannes Schindelin1-0/+4
2017-01-17sequencer (rebase -i): show only failed `git commit`'s outputJohannes Schindelin1-0/+18
2017-01-17sequencer: use run_command() directlyJohannes Schindelin1-20/+16
2017-01-17sequencer: update reading author-scriptJohannes Schindelin1-22/+12
2017-01-09sequencer (rebase -i): differentiate between comments and 'noop'Johannes Schindelin1-6/+9
2017-01-09sequencer (rebase -i): implement the 'drop' commandJohannes Schindelin1-3/+5
2017-01-09sequencer (rebase -i): allow rescheduling commandsJohannes Schindelin1-0/+6
2017-01-09sequencer (rebase -i): respect strategy/strategy_opts settingsJohannes Schindelin1-1/+25
2017-01-09sequencer (rebase -i): respect the rebase.autostash settingJohannes Schindelin1-0/+43
2017-01-09sequencer (rebase -i): run the post-rewrite hook, if neededJohannes Schindelin1-0/+14
2017-01-09sequencer (rebase -i): record interrupted commits in rewritten, tooJohannes Schindelin1-0/+8
2017-01-09sequencer (rebase -i): copy commit notes at endJohannes Schindelin1-0/+76
2017-01-09sequencer (rebase -i): set the reflog message consistentlyJohannes Schindelin1-0/+4
2017-01-09sequencer (rebase -i): refactor setting the reflog messageJohannes Schindelin1-7/+26
2017-01-09sequencer (rebase -i): allow fast-forwarding for edit/rewordJohannes Schindelin1-8/+17
2017-01-09sequencer (rebase -i): implement the 'reword' commandJohannes Schindelin1-2/+7
2017-01-09sequencer (rebase -i): leave a patch upon errorJohannes Schindelin1-1/+3
2017-01-09sequencer (rebase -i): update refs after a successful rebaseJohannes Schindelin1-1/+45
2017-01-09sequencer (rebase -i): the todo can be empty when continuingJohannes Schindelin1-2/+5
2017-01-09sequencer (rebase -i): skip some revert/cherry-pick specific code pathJohannes Schindelin1-12/+14
2017-01-09sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer neededJohannes Schindelin1-1/+6
2017-01-09sequencer (rebase -i): allow continuing with staged changesJohannes Schindelin1-0/+40
2017-01-09sequencer (rebase -i): write an author-script fileJohannes Schindelin1-1/+49
2017-01-09sequencer (rebase -i): implement the short commandsJohannes Schindelin1-14/+21
2017-01-09sequencer (rebase -i): add support for the 'fixup' and 'squash' commandsJohannes Schindelin1-10/+217
2017-01-09sequencer (rebase -i): write the 'done' fileJohannes Schindelin1-0/+23
2017-01-09sequencer (rebase -i): learn about the 'verbose' modeJohannes Schindelin1-0/+28
2017-01-09sequencer (rebase -i): implement the 'exec' commandJohannes Schindelin1-0/+57
2017-01-09sequencer (rebase -i): implement the 'edit' commandJohannes Schindelin1-3/+114
2017-01-09sequencer (rebase -i): implement the 'noop' commandJohannes Schindelin1-3/+36
2017-01-09sequencer: support a new action: 'interactive rebase'Johannes Schindelin1-4/+32
2017-01-09sequencer: use a helper to find the commit messageJohannes Schindelin1-8/+3
2017-01-09sequencer: move "else" keyword onto the same line as preceding braceJohannes Schindelin1-2/+1
2017-01-09sequencer: avoid unnecessary curly bracesJohannes Schindelin1-2/+1
2016-12-21Merge branch 'sb/sequencer-abort-safety'Junio C Hamano1-0/+49
2016-12-19Merge branch 'jc/lock-report-on-error'Junio C Hamano1-1/+1
2016-12-19Merge branch 'jt/use-trailer-api-in-commands'Junio C Hamano1-61/+14
2016-12-14Revert "sequencer: remove useless get_dir() function"Junio C Hamano1-1/+6
2016-12-09sequencer: remove useless get_dir() functionStephan Beyer1-6/+1
2016-12-09sequencer: make sequencer abort saferStephan Beyer1-0/+49
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano1-1/+1
2016-11-29sequencer: use trailer's trailer layoutJonathan Tan1-61/+14
2016-11-22Merge branch 'js/prepare-sequencer'Junio C Hamano1-1/+1
2016-11-21i18n: fix unmatched single quote in error messageJiang Xin1-1/+1
2016-11-11Merge branch 'js/prepare-sequencer'Junio C Hamano1-1/+1
2016-11-08sequencer: silence -Wtautological-constant-out-of-range-compareJeff King1-1/+1
2016-10-27Merge branch 'nd/ita-empty-commit'Junio C Hamano1-2/+2
2016-10-24commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy1-2/+2
2016-10-21sequencer: mark all error messages for translationJohannes Schindelin1-10/+16
2016-10-21sequencer: start error messages consistently with lower caseJohannes Schindelin1-34/+34
2016-10-21sequencer: quote filenames in error messagesJohannes Schindelin1-11/+11
2016-10-21sequencer: mark action_name() for translationJohannes Schindelin1-7/+7
2016-10-21sequencer: remove overzealous assumption in rebase -i modeJohannes Schindelin1-3/+4
2016-10-21sequencer: teach write_message() to append an optional LFJohannes Schindelin1-3/+8
2016-10-21sequencer: refactor write_message() to take a pointer/lengthJohannes Schindelin1-4/+6
2016-10-21sequencer: roll back lock file if write_message() failedJohannes Schindelin1-3/+7
2016-10-21sequencer: stop releasing the strbuf in write_message()Johannes Schindelin1-1/+1
2016-10-21sequencer: left-trim lines read from the scriptJohannes Schindelin1-0/+3
2016-10-21sequencer: support cleaning up commit messagesJohannes Schindelin1-3/+7
2016-10-21sequencer: support amending commitsJohannes Schindelin1-2/+4
2016-10-21sequencer: allow editing the commit message on a case-by-case basisJohannes Schindelin1-8/+40
2016-10-21sequencer: introduce a helper to read files written by scriptsJohannes Schindelin1-0/+34
2016-10-21sequencer: prepare for rebase -i's commit functionalityJohannes Schindelin1-10/+89
2016-10-21sequencer: remember the onelines when parsing the todo fileJohannes Schindelin1-0/+7
2016-10-21sequencer: get rid of the subcommand fieldJohannes Schindelin1-24/+11
2016-10-21sequencer: avoid completely different messages for different actionsJohannes Schindelin1-5/+2
2016-10-21sequencer: strip CR from the todo scriptJohannes Schindelin1-0/+3
2016-10-21sequencer: completely revamp the "todo" script parsingJohannes Schindelin1-121/+163
2016-10-21sequencer: refactor the code to obtain a short commit nameJohannes Schindelin1-3/+7
2016-10-21sequencer: future-proof read_populate_todo()Johannes Schindelin1-7/+11
2016-10-21sequencer: plug memory leaks for the option valuesJohannes Schindelin1-4/+22