aboutsummaryrefslogtreecommitdiffstats
path: root/t/t3404-rebase-interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2024-02-14Merge branch 'vn/rebase-with-cherry-pick-authorship'Junio C Hamano1-0/+12
2024-02-08sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commandsVegard Nossum1-0/+12
2023-12-09Merge branch 'ps/ref-tests-update'Junio C Hamano1-1/+1
2023-11-08Merge branch 'jc/test-i18ngrep'Junio C Hamano1-20/+20
2023-11-03t: convert tests to not write references via the filesystemPatrick Steinhardt1-1/+1
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-19/+19
2023-09-20Merge branch 'ob/t3404-typofix'Junio C Hamano1-1/+1
2023-09-14Merge branch 'pw/rebase-i-after-failure'Junio C Hamano1-12/+41
2023-09-12t3404-rebase-interactive.sh: fix typos in title of a rewording testOswald Buddenhagen1-1/+1
2023-09-06rebase -i: fix adding failed command to the todo listPhillip Wood1-11/+18
2023-09-06rebase --continue: refuse to commit after failed commandPhillip Wood1-1/+17
2023-09-06rebase: fix rewritten list for failed pickPhillip Wood1-0/+6
2023-07-24sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie1-0/+26
2023-02-28Merge branch 'pw/rebase-i-parse-fix'Junio C Hamano1-5/+7
2023-02-23rebase -i: match whole word in is_command()Phillip Wood1-5/+7
2023-02-21rebase -i: check labels and refs when parsing todo listPhillip Wood1-0/+23
2022-11-07rebase --update-refs: avoid unintended ref deletionVictoria Dye1-0/+107
2022-09-21t: remove \{m,n\} from BRE grep usageĐoàn Trần Công Danh1-3/+3
2022-07-19sequencer: notify user of --update-refs activityDerrick Stolee1-4/+33
2022-07-19rebase: add rebase.updateRefs config optionDerrick Stolee1-0/+14
2022-07-19sequencer: rewrite update-refs as user edits todo listDerrick Stolee1-0/+139
2022-07-19rebase: update refs from 'update-ref' commandsDerrick Stolee1-0/+17
2022-07-19rebase: add --update-refs optionDerrick Stolee1-0/+74
2022-03-17tests: change "mkdir -p && write_script" to use "test_hook"Ævar Arnfjörð Bjarmason1-8/+2
2022-01-03Merge branch 'es/test-chain-lint'Junio C Hamano1-2/+2
2021-12-13t0000-t3999: detect and signal failure within loopEric Sunshine1-2/+2
2021-12-05tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when neededJohannes Schindelin1-2/+0
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano1-76/+0
2021-09-12tests: remove leftover untracked filesElijah Newren1-0/+1
2021-09-07tests: stop testing `git rebase --preserve-merges`Johannes Schindelin1-76/+0
2021-08-23rebase -i: add another reword testPhillip Wood1-0/+13
2021-02-25Merge branch 'ab/detox-gettext-tests'Junio C Hamano1-19/+19
2021-02-12test-lib-functions: remove bug-inducing "diagnostics" helper paramÆvar Arnfjörð Bjarmason1-1/+2
2021-02-10tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason1-12/+12
2021-02-10tests: remove most uses of C_LOCALE_OUTPUTÆvar Arnfjörð Bjarmason1-7/+7
2021-01-25Merge branch 'js/default-branch-name-tests-final-stretch'Junio C Hamano1-0/+3
2020-11-24t3404: do not depend on any specific default branch nameJohannes Schindelin1-44/+45
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-11-04rebase -i: stop overwriting ORIG_HEAD bufferPhillip Wood1-0/+11
2020-08-19Merge branch 'ak/sequencer-fix-find-uniq-abbrev'Junio C Hamano1-0/+6
2020-08-19Merge branch 'en/sequencer-merge-labels'Junio C Hamano1-1/+1
2020-08-14sequencer: avoid garbled merge machinery messages due to commit labelsElijah Newren1-1/+1
2020-08-13rebase -i: fix possibly wrong onto hash in todoAntti Keränen1-0/+6
2020-07-30t3404: prepare 'short SHA-1 collision' tests for SHA-256Johannes Schindelin1-9/+40
2020-03-25Merge branch 'pw/advise-rebase-skip'Junio C Hamano1-19/+45
2020-03-02Merge branch 'en/rebase-backend'Junio C Hamano1-9/+10
2020-02-16rebase: rename the two primary rebase backendsElijah Newren1-1/+1
2020-02-16rebase tests: mark tests specific to the am-backend with --amElijah Newren1-1/+1
2020-02-16rebase: drop '-i' from the reflog for interactive-based rebasesElijah Newren1-5/+5
2020-01-28rebase-interactive: warn if commit is dropped with `rebase --edit-todo'Alban Gruin1-0/+121
2020-01-23rebase -i: also avoid SHA-1 collisions with missingCommitsCheckJohannes Schindelin1-0/+2
2020-01-23rebase -i: re-fix short SHA-1 collisionJohannes Schindelin1-2/+13
2020-01-17t3404: directly test the behavior of interestElijah Newren1-3/+4
2019-12-09t3404: fix indentationJohannes Schindelin1-5/+5
2019-12-06commit: give correct advice for empty commit during a rebasePhillip Wood1-0/+26
2019-12-06t3404: use test_cmp_revPhillip Wood1-19/+19
2019-11-10Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano1-228/+368
2019-10-16sequencer: run post-commit hookPhillip Wood1-0/+19
2019-10-16t3404: remove uneeded calls to set_fake_editorPhillip Wood1-20/+5
2019-10-16t3404: set $EDITOR in subshellPhillip Wood1-204/+342
2019-10-16t3404: remove unnecessary subshellPhillip Wood1-4/+2
2019-10-11Merge branch 'pw/rebase-i-show-HEAD-to-reword'Junio C Hamano1-3/+13
2019-09-30Merge branch 'dl/rebase-i-keep-base'Junio C Hamano1-1/+1
2019-09-30Merge branch 'dl/use-sq-from-test-lib'Junio C Hamano1-1/+0
2019-09-30Merge branch 'bc/hash-independent-tests-part-5'Junio C Hamano1-11/+11
2019-09-06t: use common $SQ variableDenton Liu1-1/+0
2019-09-05t: use LF variable defined in the test harnessJunio C Hamano1-2/+0
2019-08-27rebase: fast-forward --onto in more casesDenton Liu1-1/+1
2019-08-20t3404: abstract away SHA-1-specific constantsbrian m. carlson1-11/+11
2019-08-19rebase -i: always update HEAD before rewordingPhillip Wood1-3/+13
2019-07-29Merge branch 'sg/rebase-progress' into maintJunio C Hamano1-70/+50
2019-07-29Merge branch 'js/t3404-typofix' into maintJunio C Hamano1-1/+1
2019-07-09Merge branch 'sg/rebase-progress'Junio C Hamano1-70/+50
2019-07-09Merge branch 'js/t3404-typofix'Junio C Hamano1-1/+1
2019-06-24t3404: make the 'rebase.missingCommitsCheck=ignore' test more focusedSZEDER Gábor1-14/+1
2019-06-24t3404: modernize here doc styleSZEDER Gábor1-65/+58
2019-06-14t3404: fix a typoJohannes Schindelin1-1/+1
2019-03-20rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason1-6/+3
2019-02-13rebase: fix regression in rebase.useBuiltin=false test modeÆvar Arnfjörð Bjarmason1-3/+6
2019-02-06Merge branch 'pw/rebase-x-sanity-check'Junio C Hamano1-0/+19
2019-01-29rebase -x: sanity check commandPhillip Wood1-0/+19
2019-01-28implicit interactive rebase: don't run sequence editorPhillip Wood1-0/+5
2018-11-13Merge branch 'js/rebase-p-tests'Junio C Hamano1-11/+12
2018-11-06Merge branch 'sg/test-rebase-editor-fix'Junio C Hamano1-5/+5
2018-11-02tests: optionally skip `git rebase -p` testsJohannes Schindelin1-4/+4
2018-11-02t3404: decouple some test cases from outcomes of previous test casesJohannes Schindelin1-7/+8
2018-11-02Merge branch 'ag/rebase-i-in-c'Junio C Hamano1-0/+10
2018-10-29t3404-rebase-interactive: test abbreviated commandsJohannes Sixt1-5/+5
2018-09-24Merge branch 'en/sequencer-empty-edit-result-aborts'Junio C Hamano1-4/+3
2018-09-13sequencer: fix --allow-empty-message behavior, make it smarterElijah Newren1-4/+3
2018-09-04Merge branch 'pw/rebase-i-author-script-fix'Junio C Hamano1-3/+15
2018-08-29rebase -i: rewrite complete_action() in CAlban Gruin1-1/+1
2018-08-27Merge branch 'sg/test-must-be-empty'Junio C Hamano1-3/+2
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor1-3/+2
2018-08-17Merge branch 'es/rebase-i-author-script-fix'Junio C Hamano1-1/+9
2018-08-10t3404: todo list with commented-out commands only abortsAlban Gruin1-0/+10
2018-08-07sequencer: fix quoting in write_author_scriptPhillip Wood1-3/+15
2018-08-02Merge branch 'bc/sequencer-export-work-tree-as-well'Junio C Hamano1-0/+9
2018-08-02Merge branch 'es/test-fixes'Junio C Hamano1-3/+3
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timestampEric Sunshine1-1/+1
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timezoneEric Sunshine1-1/+1
2018-07-31sequencer: fix "rebase -i --root" corrupting author headerEric Sunshine1-1/+9
2018-07-24Merge branch 'jc/t3404-one-shot-export-fix'Junio C Hamano1-1/+8
2018-07-24Merge branch 'en/rebase-consistency'Junio C Hamano1-3/+4
2018-07-16sequencer: pass absolute GIT_WORK_TREE to exec commandsbrian m. carlson1-0/+9
2018-07-12t3404: fix use of "VAR=VAL cmd" with a shell functionJunio C Hamano1-1/+8
2018-07-03t: use test_write_lines() instead of series of 'echo' commandsEric Sunshine1-3/+3
2018-06-27git-rebase: make --allow-empty-message the defaultElijah Newren1-3/+4
2018-06-19sequencer: do not squash 'reword' commits when we hit conflictsPhillip Wood1-0/+28
2018-06-19t3404: check root commit in 'rebase -i --root reword root commit'Todd Zullinger1-1/+2
2018-06-18rebase --root: fix amending root commit messagesJohannes Schindelin1-1/+1
2018-06-18rebase --root: demonstrate a bug while amending root commit messagesTodd Zullinger1-0/+9
2018-05-06rebase -i --root: let the sequencer handle even the initial partJohannes Schindelin1-6/+13
2018-04-25Merge branch 'ps/test-chmtime-get'Junio C Hamano1-1/+1
2018-04-11Merge branch 'nd/combined-test-helper'Junio C Hamano1-2/+2
2018-04-10Merge branch 'ps/contains-id-error-message'Junio C Hamano1-4/+2
2018-04-09t/helper: 'test-chmtime (--get|-g)' to print only the mtimePaul-Sebastian Ungureanu1-1/+1
2018-03-27t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy1-2/+2
2018-03-22parse-options: do not show usage upon invalid option valuePaul-Sebastian Ungureanu1-4/+2
2018-03-06Merge branch 'nd/rebase-show-current-patch'Junio C Hamano1-0/+8
2018-02-13Merge branch 'pw/sequencer-in-process-commit'Junio C Hamano1-0/+14
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy1-1/+4
2018-02-12rebase: add --show-current-patchNguyễn Thái Ngọc Duy1-0/+5
2017-12-22sequencer: assign only free()able strings to gpg_signJohannes Schindelin1-0/+10
2017-12-05t3404: add test case for abbreviated commandsLiam Beguin1-0/+22
2017-11-11t3404: check intermediate squash messagesPhillip Wood1-0/+4
2017-11-06Merge branch 'jk/rebase-i-exec-gitdir-fix'Junio C Hamano1-0/+11
2017-11-02sequencer: pass absolute GIT_DIR to exec commandsJacob Keller1-0/+11
2017-07-27t3404: relax rebase.missingCommitsCheck testsJohannes Schindelin1-18/+4
2017-06-30Merge branch 'pw/rebase-i-regression-fix-tests'Junio C Hamano1-0/+7
2017-06-19rebase -i: add test for reflog messagePhillip Wood1-0/+7
2017-05-11tests: fix tests broken under GETTEXT_POISON=YesPleaseÆvar Arnfjörð Bjarmason1-7/+7
2017-02-09rebase -i: use the rebase--helper builtinJohannes Schindelin1-1/+1
2017-01-17sequencer: update reading author-scriptJohannes Schindelin1-0/+16
2016-11-23Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano1-0/+11
2016-11-21rebase -i: handle core.commentChar=autoJohannes Schindelin1-1/+1
2016-11-21rebase -i: highlight problems with core.commentcharJohannes Schindelin1-0/+11
2016-09-07rebase -i: improve advice on bad instruction linesRalf Thielow1-3/+3
2016-08-12t3404: become resilient to GETTEXT_POISONVasco Almeida1-1/+1
2016-07-28Merge branch 'js/rebase-i-tests'Junio C Hamano1-0/+8
2016-07-13Merge branch 'js/t3404-grammo-fix'Junio C Hamano1-1/+1
2016-07-07t3404: add a test for the --gpg-sign optionJohannes Schindelin1-0/+8
2016-06-29t3404: fix a grammo (commands are ran -> commands are run)Johannes Schindelin1-1/+1
2016-06-17tests: unpack-trees: update to use test_i18n* functionsVasco Almeida1-2/+2
2016-06-17i18n: rebase-interactive: mark here-doc strings for translationVasco Almeida1-7/+7
2016-05-10t3404: fix typoJohannes Schindelin1-1/+1
2016-04-22Merge branch 'jk/use-write-script-more'Junio C Hamano1-4/+3
2016-04-12t3404: use write_scriptJunio C Hamano1-4/+3
2016-03-18t3404: cleanup double empty lines between testsStefan Beller1-6/+0
2016-03-18rebase: decouple --exec from --interactiveStefan Beller1-7/+6
2015-12-11rebase -i: remember merge options beyond continue actionsFabian Ruch1-0/+16
2015-12-11Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano1-1/+1
2015-12-04t3404: fix quoting of redirect for some versions of bashCharles Bailey1-1/+1
2015-11-03Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano1-0/+12
2015-10-28rebase-i: work around Windows CRLF line endingsJunio C Hamano1-1/+1
2015-10-28t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsJohannes Schindelin1-0/+12
2015-10-16Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano1-0/+15
2015-10-05rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy1-0/+15
2015-08-12Merge branch 'dt/reflog-tests'Junio C Hamano1-5/+5
2015-08-03Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano1-0/+123
2015-07-28tests: remove some direct access to .git/logsDavid Turner1-5/+5
2015-07-13Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Junio C Hamano1-0/+21
2015-06-30git rebase -i: add static check for commands and SHA-1Galan Rémi1-0/+39
2015-06-30git rebase -i: warn about removed commitsGalan Rémi1-0/+66
2015-06-30git-rebase -i: add command "drop" to remove a commitGalan Rémi1-0/+18
2015-06-29rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin1-1/+1
2015-06-29t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin1-0/+21
2015-06-05Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano1-0/+47
2015-05-19Merge branch 'ph/rebase-i-redo'Junio C Hamano1-0/+47
2015-04-29rebase -i: redo tasks that die during cherry-pickPhil Hord1-0/+47
2015-03-23Merge branch 'es/rebase-i-count-todo' into maintJunio C Hamano1-0/+9
2015-03-20t: fix trivial &&-chain breakageJeff King1-1/+1
2015-03-20t: fix moderate &&-chain breakageJeff King1-1/+1
2015-03-17Merge branch 'es/rebase-i-count-todo'Junio C Hamano1-0/+9
2015-03-06rebase-interactive: suppress whitespace preceding item countEric Sunshine1-0/+9
2015-01-22rebase -i: use full object name internally throughout the scriptKirill A. Shutemov1-0/+7
2014-06-06Merge branch 'mt/rebase-i-keep-empty-test'Junio C Hamano1-0/+8
2014-05-19rebase --keep-empty -i: add testMichael S. Tsirkin1-0/+8
2014-03-19tests: use "env" to run commands with temporary env-var settingsDavid Tran1-56/+13
2013-09-11Merge branch 'es/rebase-i-no-abbrev'Junio C Hamano1-2/+87
2013-08-25rebase -i: fix short SHA-1 collisionJunio C Hamano1-1/+1
2013-08-25t3404: rebase -i: demonstrate short SHA-1 collisionEric Sunshine1-0/+24
2013-08-25t3404: make tests more self-containedEric Sunshine1-2/+63
2013-08-07die_with_status: use "printf '%s\n'", not "echo"Matthieu Moy1-0/+13
2013-07-18Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano1-0/+15
2013-07-02Do not ignore merge options in interactive rebaseArnaud Fontaine1-0/+11
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano1-0/+11
2013-06-23rebase -i: use a better reflog messageRamkumar Ramachandra1-0/+15
2013-06-23Merge branch 'mz/rebase-tests'Junio C Hamano1-9/+1
2013-06-14rebase: use peel_committish() where appropriateRamkumar Ramachandra1-1/+1
2013-06-14t/rebase: add failing tests for a peculiar revisionRamkumar Ramachandra1-0/+11
2013-06-07add tests for rebasing merged historyMartin von Zweigbergk1-9/+1
2013-05-28test: rebase: fix --interactive testFelipe Contreras1-1/+1
2013-03-25t4304: use test_config to set/unset git config variablesYann Droneaud1-2/+1
2013-02-17Merge branch 'jk/rebase-i-comment-char'Junio C Hamano1-0/+14
2013-02-12rebase -i: respect core.commentcharJohn Keeping1-0/+14
2012-12-22tests: move test_cmp_rev to test-lib-functionsMartin von Zweigbergk1-6/+0
2012-09-29Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano1-0/+18
2012-09-18rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt1-0/+11
2012-09-17rebase -i: Add tests for "--edit-todo"Andrew Wong1-0/+18
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-20 11:52:48 +0000