(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "git rebase interactive\n"> <LIT_CHARS "\n"> <LIT_CHARS "This test runs git rebase \"interactively\", by faking an edit, and verifies\n"> <LIT_CHARS "that the result still makes sense.\n"> <LIT_CHARS "\n"> <LIT_CHARS "Initial setup:\n"> <LIT_CHARS "\n"> <LIT_CHARS "     one - two - three - four (conflict-branch)\n"> <LIT_CHARS "   /\n"> <LIT_CHARS " A - B - C - D - E            (master)\n"> <LIT_CHARS " | \\\n"> <LIT_CHARS " |   F - G - H                (branch1)\n"> <LIT_CHARS " |     \\\n"> <LIT_CHARS " |\\      I                    (branch2)\n"> <LIT_CHARS " | \\\n"> <LIT_CHARS " |   J - K - L - M            (no-conflict-branch)\n"> <LIT_CHARS "  \\\n"> <LIT_CHARS "    N - O - P                 (no-ff-branch)\n"> <LIT_CHARS "\n"> <LIT_CHARS " where A, B, D and G all touch file1, and one, two, three, four all\n"> <LIT_CHARS " touch file \"conflict\".\n">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]})
  (Com {[LIT_CHARS .]} {[DQ [VarSub TEST_DIRECTORY]] [LIT_CHARS /lib-rebase.sh]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS setup>]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_commit A file1 &&\n"> <LIT_CHARS "\ttest_commit B file1 &&\n"> <LIT_CHARS "\ttest_commit C file2 &&\n"> <LIT_CHARS "\ttest_commit D file1 &&\n"> <LIT_CHARS "\ttest_commit E file3 &&\n"> <LIT_CHARS "\tgit checkout -b branch1 A &&\n"> <LIT_CHARS "\ttest_commit F file4 &&\n"> <LIT_CHARS "\ttest_commit G file1 &&\n"> <LIT_CHARS "\ttest_commit H file5 &&\n"> <LIT_CHARS "\tgit checkout -b branch2 F &&\n"> <LIT_CHARS "\ttest_commit I file6 &&\n"> <LIT_CHARS "\tgit checkout -b conflict-branch A &&\n"> <LIT_CHARS "\ttest_commit one conflict &&\n"> <LIT_CHARS "\ttest_commit two conflict &&\n"> <LIT_CHARS "\ttest_commit three conflict &&\n"> <LIT_CHARS "\ttest_commit four conflict &&\n"> <LIT_CHARS "\tgit checkout -b no-conflict-branch A &&\n"> <LIT_CHARS "\ttest_commit J fileJ &&\n"> <LIT_CHARS "\ttest_commit K fileK &&\n"> <LIT_CHARS "\ttest_commit L fileL &&\n"> <LIT_CHARS "\ttest_commit M fileM &&\n"> <LIT_CHARS "\tgit checkout -b no-ff-branch A &&\n"> <LIT_CHARS "\ttest_commit N fileN &&\n"> <LIT_CHARS "\ttest_commit O fileO &&\n"> <LIT_CHARS "\ttest_commit P fileP\n">]})
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('SHELL', {[SQ ]})])
  (= scope=<EAssignScope.GLOBAL 1> flags=1 words=[{[LIT_CHARS SHELL]}] bindings=[])
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase --keep-empty">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b emptybranch master &&\n"> <LIT_CHARS "\tgit commit --allow-empty -m \"empty\" &&\n"> <LIT_CHARS "\tgit rebase --keep-empty -i HEAD~2 &&\n"> <LIT_CHARS "\tgit log --oneline >actual &&\n"> <LIT_CHARS "\ttest_line_count = 6 actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i with the exec command">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 exec_>touch-one\n"> <LIT_CHARS "\t\t2 exec_>touch-two exec_false exec_>touch-three\n"> <LIT_CHARS "\t\t3 4 exec_>\\\"touch-file__name_with_spaces\\\";_>touch-after-semicolon 5\" &&\n"> <LIT_CHARS "\texport FAKE_LINES &&\n"> <LIT_CHARS "\ttest_must_fail git rebase -i A\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_path_is_file touch-one &&\n"> <LIT_CHARS "\ttest_path_is_file touch-two &&\n"> <LIT_CHARS "\ttest_path_is_missing touch-three \" (should have stopped before)\" &&\n"> <LIT_CHARS "\ttest_cmp_rev C HEAD &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest_path_is_file touch-three &&\n"> <LIT_CHARS "\ttest_path_is_file \"touch-file  name with spaces\" &&\n"> <LIT_CHARS "\ttest_path_is_file touch-after-semicolon &&\n"> <LIT_CHARS "\ttest_cmp_rev master HEAD &&\n"> <LIT_CHARS "\trm -f touch-*\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i with the exec command runs from tree root">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\tmkdir subdir && (cd subdir &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 exec_>touch-subdir\" \\\n"> <LIT_CHARS "\t\tgit rebase -i HEAD^\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_path_is_file touch-subdir &&\n"> <LIT_CHARS "\trm -fr subdir\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i with the exec command checks tree cleanness">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_LINES=\"exec_echo_foo_>file1 1\" git rebase -i HEAD^ &&\n"> <LIT_CHARS "\ttest_cmp_rev master^ HEAD &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit rebase --continue\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i with exec of inexistent command">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\ttest_when_finished \"git rebase --abort\" &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_LINES=\"exec_this-command-does-not-exist 1\" \\\n"> <LIT_CHARS "\tgit rebase -i HEAD^ >actual 2>&1 &&\n"> <LIT_CHARS "\t! grep \"Maybe git-rebase is broken\" actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "no changes are a nop">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout branch2 &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i F &&\n"> <LIT_CHARS "\ttest \"$(git symbolic-ref -q HEAD)\" = \"refs/heads/branch2\" &&\n"> <LIT_CHARS "\ttest $(git rev-parse I) = $(git rev-parse HEAD)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "test the [branch] option">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b dead-end &&\n"> <LIT_CHARS "\tgit rm file6 &&\n"> <LIT_CHARS "\tgit commit -m \"stop here\" &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i F branch2 &&\n"> <LIT_CHARS "\ttest \"$(git symbolic-ref -q HEAD)\" = \"refs/heads/branch2\" &&\n"> <LIT_CHARS "\ttest $(git rev-parse I) = $(git rev-parse branch2) &&\n"> <LIT_CHARS "\ttest $(git rev-parse I) = $(git rev-parse HEAD)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "test --onto <branch>">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b test-onto branch2 &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i --onto branch1 F &&\n"> <LIT_CHARS "\ttest \"$(git symbolic-ref -q HEAD)\" = \"refs/heads/test-onto\" &&\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD^) = $(git rev-parse branch1) &&\n"> <LIT_CHARS "\ttest $(git rev-parse I) = $(git rev-parse branch2)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase on top of a non-conflicting commit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout branch1 &&\n"> <LIT_CHARS "\tgit tag original-branch1 &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i branch2 &&\n"> <LIT_CHARS "\ttest file6 = $(git diff --name-only original-branch1) &&\n"> <LIT_CHARS "\ttest \"$(git symbolic-ref -q HEAD)\" = \"refs/heads/branch1\" &&\n"> <LIT_CHARS "\ttest $(git rev-parse I) = $(git rev-parse branch2) &&\n"> <LIT_CHARS "\ttest $(git rev-parse I) = $(git rev-parse HEAD~2)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "reflog for the branch shows state before rebase">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "exchange two commits">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"2 1\" git rebase -i HEAD~2 &&\n"> <LIT_CHARS "\ttest H = $(git cat-file commit HEAD^ | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest G = $(git cat-file commit HEAD | sed -ne \\$p)\n">]})
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expect]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=True body_word={[DQ [LIT_CHARS "diff --git a/file1 b/file1\n"][LIT_CHARS "index f70f10e..fd79235 100644\n"][LIT_CHARS "--- a/file1\n"][LIT_CHARS "+++ b/file1\n"][LIT_CHARS "@@ -1 +1 @@\n"][LIT_CHARS "-A\n"][LIT_CHARS "+G\n"]]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expect2]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=True body_word={[DQ [LIT_CHARS "<<<<<<< HEAD\n"][LIT_CHARS "D\n"][LIT_CHARS "=======\n"][LIT_CHARS "G\n"][LIT_CHARS ">>>>>>> 5d18e54... G\n"]]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "stop on conflicting pick">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit tag new-branch1 &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail git rebase -i master &&\n"> <LIT_CHARS "\ttest \"$(git rev-parse HEAD~3)\" = \"$(git rev-parse master)\" &&\n"> <LIT_CHARS "\ttest_cmp expect .git/rebase-merge/patch &&\n"> <LIT_CHARS "\ttest_cmp expect2 file1 &&\n"> <LIT_CHARS "\ttest \"$(git diff --name-status |\n"> <LIT_CHARS "\t\tsed -n -e \"/^U/s/^U[^a-z]*//p\")\" = file1 &&\n"> <LIT_CHARS "\ttest 4 = $(grep -v \"^#\" < .git/rebase-merge/done | wc -l) &&\n"> <LIT_CHARS "\ttest 0 = $(grep -c \"^[^#]\" < .git/rebase-merge/git-rebase-todo)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS abort>]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit rebase --abort &&\n"> <LIT_CHARS "\ttest $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&\n"> <LIT_CHARS "\ttest \"$(git symbolic-ref -q HEAD)\" = \"refs/heads/branch1\" &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/rebase-merge\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "abort with error when new base cannot be checked out">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit rm --cached file1 &&\n"> <LIT_CHARS "\tgit commit -m \"remove file in base\" &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail git rebase -i master > output 2>&1 &&\n"> <LIT_CHARS "\ttest_i18ngrep \"The following untracked working tree files would be overwritten by checkout:\" \\\n"> <LIT_CHARS "\t\toutput &&\n"> <LIT_CHARS "\ttest_i18ngrep \"file1\" output &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/rebase-merge &&\n"> <LIT_CHARS "\tgit reset --hard HEAD^\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "retain authorship">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo A > file7 &&\n"> <LIT_CHARS "\tgit add file7 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tGIT_AUTHOR_NAME=\"Twerp Snog\" git commit -m \"different author\" &&\n"> <LIT_CHARS "\tgit tag twerp &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i --onto master HEAD^ &&\n"> <LIT_CHARS "\tgit show HEAD | grep \"^Author: Twerp Snog\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS squash>]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard twerp &&\n"> <LIT_CHARS "\techo B > file7 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tGIT_AUTHOR_NAME=\"Nitfol\" git commit -m \"nitfol\" file7 &&\n"> <LIT_CHARS "\techo \"******************************\" &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 squash 2\" EXPECT_HEADER_COUNT=2 \\\n"> <LIT_CHARS "\t\tgit rebase -i --onto master HEAD~2 &&\n"> <LIT_CHARS "\ttest B = $(cat file7) &&\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD^) = $(git rev-parse master)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "retain authorship when squashing">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit show HEAD | grep \"^Author: Twerp Snog\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "-p handles \"no changes\" gracefully">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tHEAD=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i -p HEAD^ &&\n"> <LIT_CHARS "\tgit update-index --refresh &&\n"> <LIT_CHARS "\tgit diff-files --quiet &&\n"> <LIT_CHARS "\tgit diff-index --quiet --cached HEAD -- &&\n"> <LIT_CHARS "\ttest $HEAD = $(git rev-parse HEAD)\n">]})
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "exchange two commits with -p">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout H &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"2 1\" git rebase -i -p HEAD~2 &&\n"> <LIT_CHARS "\ttest H = $(git cat-file commit HEAD^ | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest G = $(git cat-file commit HEAD | sed -ne \\$p)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "preserve merges with -p">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b to-be-preserved master^ &&\n"> <LIT_CHARS "\t: > unrelated-file &&\n"> <LIT_CHARS "\tgit add unrelated-file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"unrelated\" &&\n"> <LIT_CHARS "\tgit checkout -b another-branch master &&\n"> <LIT_CHARS "\techo B > file1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m J file1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge to-be-preserved &&\n"> <LIT_CHARS "\techo C > file1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m K file1 &&\n"> <LIT_CHARS "\techo D > file1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m L1 file1 &&\n"> <LIT_CHARS "\tgit checkout HEAD^ &&\n"> <LIT_CHARS "\techo 1 > unrelated-file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m L2 unrelated-file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit merge another-branch &&\n"> <LIT_CHARS "\techo E > file1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m M file1 &&\n"> <LIT_CHARS "\tgit checkout -b to-be-rebased &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i -p --onto branch1 master &&\n"> <LIT_CHARS "\tgit update-index --refresh &&\n"> <LIT_CHARS "\tgit diff-files --quiet &&\n"> <LIT_CHARS "\tgit diff-index --quiet --cached HEAD -- &&\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) &&\n"> <LIT_CHARS "\ttest $(git show HEAD~5:file1) = B &&\n"> <LIT_CHARS "\ttest $(git show HEAD~3:file1) = C &&\n"> <LIT_CHARS "\ttest $(git show HEAD:file1) = E &&\n"> <LIT_CHARS "\ttest $(git show HEAD:unrelated-file) = 1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "edit ancestor with -p">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 2 edit 3 4\" git rebase -i -p HEAD~3 &&\n"> <LIT_CHARS "\techo 2 > unrelated-file &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m L2-modified --amend unrelated-file &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\tgit update-index --refresh &&\n"> <LIT_CHARS "\tgit diff-files --quiet &&\n"> <LIT_CHARS "\tgit diff-index --quiet --cached HEAD -- &&\n"> <LIT_CHARS "\ttest $(git show HEAD:unrelated-file) = 2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--continue tries to commit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail git rebase -i --onto new-branch1 HEAD^ &&\n"> <LIT_CHARS "\techo resolved > file1 &&\n"> <LIT_CHARS "\tgit add file1 &&\n"> <LIT_CHARS "\tFAKE_COMMIT_MESSAGE=\"chouette!\" git rebase --continue &&\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&\n"> <LIT_CHARS "\tgit show HEAD | grep chouette\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "verbose flag is heeded, even after --continue">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard master@{1} &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&\n"> <LIT_CHARS "\techo resolved > file1 &&\n"> <LIT_CHARS "\tgit add file1 &&\n"> <LIT_CHARS "\tgit rebase --continue > output &&\n"> <LIT_CHARS "\tgrep \"^ file1 | 2 +-$\" output\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "multi-squash only fires up editor once">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tbase=$(git rev-parse HEAD~4) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_COMMIT_AMEND=\"ONCE\" FAKE_LINES=\"1 squash 2 squash 3 squash 4\" \\\n"> <LIT_CHARS "\t\tEXPECT_HEADER_COUNT=4 \\\n"> <LIT_CHARS "\t\tgit rebase -i $base &&\n"> <LIT_CHARS "\ttest $base = $(git rev-parse HEAD^) &&\n"> <LIT_CHARS "\ttest 1 = $(git show | grep ONCE | wc -l)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "multi-fixup does not fire up editor">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b multi-fixup E &&\n"> <LIT_CHARS "\tbase=$(git rev-parse HEAD~4) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_COMMIT_AMEND=\"NEVER\" FAKE_LINES=\"1 fixup 2 fixup 3 fixup 4\" \\\n"> <LIT_CHARS "\t\tgit rebase -i $base &&\n"> <LIT_CHARS "\ttest $base = $(git rev-parse HEAD^) &&\n"> <LIT_CHARS "\ttest 0 = $(git show | grep NEVER | wc -l) &&\n"> <LIT_CHARS "\tgit checkout to-be-rebased &&\n"> <LIT_CHARS "\tgit branch -D multi-fixup\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "commit message used after conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b conflict-fixup conflict-branch &&\n"> <LIT_CHARS "\tbase=$(git rev-parse HEAD~4) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_LINES=\"1 fixup 3 fixup 4\" git rebase -i $base &&\n"> <LIT_CHARS "\techo three > conflict &&\n"> <LIT_CHARS "\tgit add conflict &&\n"> <LIT_CHARS "\tFAKE_COMMIT_AMEND=\"ONCE\" EXPECT_HEADER_COUNT=2 \\\n"> <LIT_CHARS "\t\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest $base = $(git rev-parse HEAD^) &&\n"> <LIT_CHARS "\ttest 1 = $(git show | grep ONCE | wc -l) &&\n"> <LIT_CHARS "\tgit checkout to-be-rebased &&\n"> <LIT_CHARS "\tgit branch -D conflict-fixup\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "commit message retained after conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b conflict-squash conflict-branch &&\n"> <LIT_CHARS "\tbase=$(git rev-parse HEAD~4) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_LINES=\"1 fixup 3 squash 4\" git rebase -i $base &&\n"> <LIT_CHARS "\techo three > conflict &&\n"> <LIT_CHARS "\tgit add conflict &&\n"> <LIT_CHARS "\tFAKE_COMMIT_AMEND=\"TWICE\" EXPECT_HEADER_COUNT=2 \\\n"> <LIT_CHARS "\t\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest $base = $(git rev-parse HEAD^) &&\n"> <LIT_CHARS "\ttest 2 = $(git show | grep TWICE | wc -l) &&\n"> <LIT_CHARS "\tgit checkout to-be-rebased &&\n"> <LIT_CHARS "\tgit branch -D conflict-squash\n">]})
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expect-squash-fixup]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=True body_word={[DQ [LIT_CHARS "B\n"][LIT_CHARS "\n"][LIT_CHARS "D\n"][LIT_CHARS "\n"][LIT_CHARS "ONCE\n"]]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "squash and fixup generate correct log messages">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b squash-fixup E &&\n"> <LIT_CHARS "\tbase=$(git rev-parse HEAD~4) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_COMMIT_AMEND=\"ONCE\" FAKE_LINES=\"1 fixup 2 squash 3 fixup 4\" \\\n"> <LIT_CHARS "\t\tEXPECT_HEADER_COUNT=4 \\\n"> <LIT_CHARS "\t\tgit rebase -i $base &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD | sed -e 1,/^\\$/d > actual-squash-fixup &&\n"> <LIT_CHARS "\ttest_cmp expect-squash-fixup actual-squash-fixup &&\n"> <LIT_CHARS "\tgit checkout to-be-rebased &&\n"> <LIT_CHARS "\tgit branch -D squash-fixup\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "squash ignores comments">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b skip-comments E &&\n"> <LIT_CHARS "\tbase=$(git rev-parse HEAD~4) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_COMMIT_AMEND=\"ONCE\" FAKE_LINES=\"# 1 # squash 2 # squash 3 # squash 4 #\" \\\n"> <LIT_CHARS "\t\tEXPECT_HEADER_COUNT=4 \\\n"> <LIT_CHARS "\t\tgit rebase -i $base &&\n"> <LIT_CHARS "\ttest $base = $(git rev-parse HEAD^) &&\n"> <LIT_CHARS "\ttest 1 = $(git show | grep ONCE | wc -l) &&\n"> <LIT_CHARS "\tgit checkout to-be-rebased &&\n"> <LIT_CHARS "\tgit branch -D skip-comments\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "squash ignores blank lines">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b skip-blank-lines E &&\n"> <LIT_CHARS "\tbase=$(git rev-parse HEAD~4) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_COMMIT_AMEND=\"ONCE\" FAKE_LINES=\"> 1 > squash 2 > squash 3 > squash 4 >\" \\\n"> <LIT_CHARS "\t\tEXPECT_HEADER_COUNT=4 \\\n"> <LIT_CHARS "\t\tgit rebase -i $base &&\n"> <LIT_CHARS "\ttest $base = $(git rev-parse HEAD^) &&\n"> <LIT_CHARS "\ttest 1 = $(git show | grep ONCE | wc -l) &&\n"> <LIT_CHARS "\tgit checkout to-be-rebased &&\n"> <LIT_CHARS "\tgit branch -D skip-blank-lines\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "squash works as expected">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b squash-works no-conflict-branch &&\n"> <LIT_CHARS "\tone=$(git rev-parse HEAD~3) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 squash 3 2\" EXPECT_HEADER_COUNT=2 \\\n"> <LIT_CHARS "\t\tgit rebase -i HEAD~3 &&\n"> <LIT_CHARS "\ttest $one = $(git rev-parse HEAD~2)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "interrupted squash works as expected">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b interrupted-squash conflict-branch &&\n"> <LIT_CHARS "\tone=$(git rev-parse HEAD~3) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_LINES=\"1 squash 3 2\" git rebase -i HEAD~3 &&\n"> <LIT_CHARS "\t(echo one; echo two; echo four) > conflict &&\n"> <LIT_CHARS "\tgit add conflict &&\n"> <LIT_CHARS "\ttest_must_fail git rebase --continue &&\n"> <LIT_CHARS "\techo resolved > conflict &&\n"> <LIT_CHARS "\tgit add conflict &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest $one = $(git rev-parse HEAD~2)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "interrupted squash works as expected (case 2)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b interrupted-squash2 conflict-branch &&\n"> <LIT_CHARS "\tone=$(git rev-parse HEAD~3) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_LINES=\"3 squash 1 2\" git rebase -i HEAD~3 &&\n"> <LIT_CHARS "\t(echo one; echo four) > conflict &&\n"> <LIT_CHARS "\tgit add conflict &&\n"> <LIT_CHARS "\ttest_must_fail git rebase --continue &&\n"> <LIT_CHARS "\t(echo one; echo two; echo four) > conflict &&\n"> <LIT_CHARS "\tgit add conflict &&\n"> <LIT_CHARS "\ttest_must_fail git rebase --continue &&\n"> <LIT_CHARS "\techo resolved > conflict &&\n"> <LIT_CHARS "\tgit add conflict &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest $one = $(git rev-parse HEAD~2)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--continue tries to commit, even for \"edit\"">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo unrelated > file7 &&\n"> <LIT_CHARS "\tgit add file7 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"unrelated change\" &&\n"> <LIT_CHARS "\tparent=$(git rev-parse HEAD^) &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"edit 1\" git rebase -i HEAD^ &&\n"> <LIT_CHARS "\techo edited > file7 &&\n"> <LIT_CHARS "\tgit add file7 &&\n"> <LIT_CHARS "\tFAKE_COMMIT_MESSAGE=\"chouette!\" git rebase --continue &&\n"> <LIT_CHARS "\ttest edited = $(git show HEAD:file7) &&\n"> <LIT_CHARS "\tgit show HEAD | grep chouette &&\n"> <LIT_CHARS "\ttest $parent = $(git rev-parse HEAD^)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "aborted --continue does not squash commits after \"edit\"">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\told=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"edit 1\" git rebase -i HEAD^ &&\n"> <LIT_CHARS "\techo \"edited again\" > file7 &&\n"> <LIT_CHARS "\tgit add file7 &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_COMMIT_MESSAGE=\" \" git rebase --continue &&\n"> <LIT_CHARS "\ttest $old = $(git rev-parse HEAD) &&\n"> <LIT_CHARS "\tgit rebase --abort\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "auto-amend only edited commits after \"edit\"">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"edit 1\" git rebase -i HEAD^ &&\n"> <LIT_CHARS "\techo \"edited again\" > file7 &&\n"> <LIT_CHARS "\tgit add file7 &&\n"> <LIT_CHARS "\tFAKE_COMMIT_MESSAGE=\"edited file7 again\" git commit &&\n"> <LIT_CHARS "\techo \"and again\" > file7 &&\n"> <LIT_CHARS "\tgit add file7 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_COMMIT_MESSAGE=\"and again\" git rebase --continue &&\n"> <LIT_CHARS "\tgit rebase --abort\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "clean error after failed \"exec\"">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\ttest_when_finished \"git rebase --abort || :\" &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_LINES=\"1 exec_false\" git rebase -i HEAD^ &&\n"> <LIT_CHARS "\techo \"edited again\" > file7 &&\n"> <LIT_CHARS "\tgit add file7 &&\n"> <LIT_CHARS "\ttest_must_fail git rebase --continue 2>error &&\n"> <LIT_CHARS "\ttest_i18ngrep \"You have staged changes in your working tree.\" error\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase a detached HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgrandparent=$(git rev-parse HEAD~2) &&\n"> <LIT_CHARS "\tgit checkout $(git rev-parse HEAD) &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"2 1\" git rebase -i HEAD~2 &&\n"> <LIT_CHARS "\ttest $grandparent = $(git rev-parse HEAD~2)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase a commit violating pre-commit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tmkdir -p .git/hooks &&\n"> <LIT_CHARS "\twrite_script .git/hooks/pre-commit <<-\\EOF &&\n"> <LIT_CHARS "\ttest -z \"$(git diff --cached --check)\"\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\techo \"monde! \" >> file1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\ttest_must_fail git commit -m doesnt-verify file1 &&\n"> <LIT_CHARS "\tgit commit -m doesnt-verify --no-verify file1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=2 git rebase -i HEAD~2\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase with a file named HEAD in worktree">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\trm -fr .git/hooks &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout -b branch3 A &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tGIT_AUTHOR_NAME=\"Squashed Away\" &&\n"> <LIT_CHARS "\t\texport GIT_AUTHOR_NAME &&\n"> <LIT_CHARS "\t\t>HEAD &&\n"> <LIT_CHARS "\t\tgit add HEAD &&\n"> <LIT_CHARS "\t\tgit commit -m \"Add head\" &&\n"> <LIT_CHARS "\t\t>BODY &&\n"> <LIT_CHARS "\t\tgit add BODY &&\n"> <LIT_CHARS "\t\tgit commit -m \"Add body\"\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 squash 2\" git rebase -i to-be-rebased &&\n"> <LIT_CHARS "\ttest \"$(git show -s --pretty=format:%an)\" = \"Squashed Away\"\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "do \"noop\" when there is nothing to cherry-pick">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b branch4 HEAD &&\n"> <LIT_CHARS "\tGIT_EDITOR=: git commit --amend \\\n"> <LIT_CHARS "\t\t--author=\"Somebody else <somebody@else.com>\" &&\n"> <LIT_CHARS "\ttest $(git rev-parse branch3) != $(git rev-parse branch4) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i branch3 &&\n"> <LIT_CHARS "\ttest $(git rev-parse branch3) = $(git rev-parse branch4)\n"> <LIT_CHARS "\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "submodule rebase setup">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout A &&\n"> <LIT_CHARS "\tmkdir sub &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd sub && git init && >elif &&\n"> <LIT_CHARS "\t\tgit add elif && git commit -m \"submodule initial\"\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\techo 1 >file1 &&\n"> <LIT_CHARS "\tgit add file1 sub &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"One\" &&\n"> <LIT_CHARS "\techo 2 >file1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -a -m \"Two\" &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd sub && echo 3 >elif &&\n"> <LIT_CHARS "\t\tgit commit -a -m \"submodule second\"\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit commit -a -m \"Three changes submodule\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "submodule rebase -i">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 squash 2 3\" git rebase -i A\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "submodule conflict setup">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit tag submodule-base &&\n"> <LIT_CHARS "\tgit checkout HEAD^ &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tcd sub && git checkout HEAD^ && echo 4 >elif &&\n"> <LIT_CHARS "\t\tgit add elif && git commit -m \"submodule conflict\"\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\tgit add sub &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m \"Conflict in submodule\" &&\n"> <LIT_CHARS "\tgit tag submodule-topic\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i continue with only submodule staged">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail git rebase -i submodule-base &&\n"> <LIT_CHARS "\tgit add sub &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest $(git rev-parse submodule-base) != $(git rev-parse HEAD)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i continue with unstaged submodule">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout submodule-topic &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail git rebase -i submodule-base &&\n"> <LIT_CHARS "\tgit reset &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest $(git rev-parse submodule-base) = $(git rev-parse HEAD)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "avoid unnecessary reset">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\ttest-chmtime =123456789 file3 &&\n"> <LIT_CHARS "\tgit update-index --refresh &&\n"> <LIT_CHARS "\tHEAD=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i HEAD~4 &&\n"> <LIT_CHARS "\ttest $HEAD = $(git rev-parse HEAD) &&\n"> <LIT_CHARS "\tMTIME=$(test-chmtime -v +0 file3 | sed ">] [LIT_CHARS s/] [LIT_OTHER "["] [LIT_OTHER "^"] [LIT_CHARS 0-9] [LIT_OTHER "]"] [LIT_CHARS .] [LIT_OTHER "*"] [LIT_OTHER "$"] [LIT_CHARS //] [SQ <LIT_CHARS ") &&\n"> <LIT_CHARS "\ttest 123456789 = $MTIME\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS reword>]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b reword-branch master &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 2 3 reword 4\" FAKE_COMMIT_MESSAGE=\"E changed\" git rebase -i A &&\n"> <LIT_CHARS "\tgit show HEAD | grep \"E changed\" &&\n"> <LIT_CHARS "\ttest $(git rev-parse master) != $(git rev-parse HEAD) &&\n"> <LIT_CHARS "\ttest $(git rev-parse master^) = $(git rev-parse HEAD^) &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 2 reword 3 4\" FAKE_COMMIT_MESSAGE=\"D changed\" git rebase -i A &&\n"> <LIT_CHARS "\tgit show HEAD^ | grep \"D changed\" &&\n"> <LIT_CHARS "\tFAKE_LINES=\"reword 1 2 3 4\" FAKE_COMMIT_MESSAGE=\"B changed\" git rebase -i A &&\n"> <LIT_CHARS "\tgit show HEAD~3 | grep \"B changed\" &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 reword 2 3 4\" FAKE_COMMIT_MESSAGE=\"C changed\" git rebase -i A &&\n"> <LIT_CHARS "\tgit show HEAD~2 | grep \"C changed\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i can copy notes">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit config notes.rewrite.rebase true &&\n"> <LIT_CHARS "\tgit config notes.rewriteRef \"refs/notes/*\" &&\n"> <LIT_CHARS "\ttest_commit n1 &&\n"> <LIT_CHARS "\ttest_commit n2 &&\n"> <LIT_CHARS "\ttest_commit n3 &&\n"> <LIT_CHARS "\tgit notes add -m\"a note\" n3 &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i --onto n1 n2 &&\n"> <LIT_CHARS "\ttest \"a note\" = \"$(git notes show HEAD)\"\n">]})
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expect]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=True body_word={[DQ [LIT_CHARS "an earlier note\n"][LIT_CHARS "\n"][LIT_CHARS "a note\n"]]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i can copy notes over a fixup">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard n3 &&\n"> <LIT_CHARS "\tgit notes add -m\"an earlier note\" n2 &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tGIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES=\"1 fixup 2\" git rebase -i n1 &&\n"> <LIT_CHARS "\tgit notes show > output &&\n"> <LIT_CHARS "\ttest_cmp expect output\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase while detaching HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit symbolic-ref HEAD &&\n"> <LIT_CHARS "\tgrandparent=$(git rev-parse HEAD~2) &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"2 1\" git rebase -i HEAD~2 HEAD^0 &&\n"> <LIT_CHARS "\ttest $grandparent = $(git rev-parse HEAD~2) &&\n"> <LIT_CHARS "\ttest_must_fail git symbolic-ref HEAD\n">]})
  (Com {[LIT_CHARS test_tick]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "always cherry-pick with --no-ff">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout no-ff-branch &&\n"> <LIT_CHARS "\tgit tag original-no-ff-branch &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i --no-ff A &&\n"> <LIT_CHARS "\ttouch empty &&\n"> <LIT_CHARS "\tfor p in 0 1 2\n"> <LIT_CHARS "\tdo\n"> <LIT_CHARS "\t\ttest ! $(git rev-parse HEAD~$p) = $(git rev-parse original-no-ff-branch~$p) &&\n"> <LIT_CHARS "\t\tgit diff HEAD~$p original-no-ff-branch~$p > out &&\n"> <LIT_CHARS "\t\ttest_cmp empty out\n"> <LIT_CHARS "\tdone &&\n"> <LIT_CHARS "\ttest $(git rev-parse HEAD~3) = $(git rev-parse original-no-ff-branch~3) &&\n"> <LIT_CHARS "\tgit diff HEAD~3 original-no-ff-branch~3 > out &&\n"> <LIT_CHARS "\ttest_cmp empty out\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "set up commits with funny messages">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b funny A &&\n"> <LIT_CHARS "\techo >>file1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -a -m \"end with slash\\\\\" &&\n"> <LIT_CHARS "\techo >>file1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -a -m \"something (\\000) that looks like octal\" &&\n"> <LIT_CHARS "\techo >>file1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -a -m \"something (\\n) that looks like a newline\" &&\n"> <LIT_CHARS "\techo >>file1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -a -m \"another commit\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase-i history with funny messages">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit rev-list A..funny >expect &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 2 3 4\" git rebase -i A &&\n"> <LIT_CHARS "\tgit rev-list A.. >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "prepare for rebase -i --exec">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout master &&\n"> <LIT_CHARS "\tgit checkout -b execute &&\n"> <LIT_CHARS "\ttest_commit one_exec main.txt one_exec &&\n"> <LIT_CHARS "\ttest_commit two_exec main.txt two_exec &&\n"> <LIT_CHARS "\ttest_commit three_exec main.txt three_exec\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "running \"git rebase -i --exec git show HEAD\"">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i --exec \"git show HEAD\" HEAD~2 >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tFAKE_LINES=\"1 exec_git_show_HEAD 2 exec_git_show_HEAD\" &&\n"> <LIT_CHARS "\t\texport FAKE_LINES &&\n"> <LIT_CHARS "\t\tgit rebase -i HEAD~2 >expect\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\tsed -e \"1,9d\" expect >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "running \"git rebase --exec git show HEAD -i\"">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard execute &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase --exec \"git show HEAD\" -i HEAD~2 >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tFAKE_LINES=\"1 exec_git_show_HEAD 2 exec_git_show_HEAD\" &&\n"> <LIT_CHARS "\t\texport FAKE_LINES &&\n"> <LIT_CHARS "\t\tgit rebase -i HEAD~2 >expect\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\tsed -e \"1,9d\" expect >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "running \"git rebase -ix git show HEAD\"">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard execute &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -ix \"git show HEAD\" HEAD~2 >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tFAKE_LINES=\"1 exec_git_show_HEAD 2 exec_git_show_HEAD\" &&\n"> <LIT_CHARS "\t\texport FAKE_LINES &&\n"> <LIT_CHARS "\t\tgit rebase -i HEAD~2 >expect\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\tsed -e \"1,9d\" expect >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -ix with several <CMD>">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard execute &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -ix \"git show HEAD; pwd\" HEAD~2 >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tFAKE_LINES=\"1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd\" &&\n"> <LIT_CHARS "\t\texport FAKE_LINES &&\n"> <LIT_CHARS "\t\tgit rebase -i HEAD~2 >expect\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\tsed -e \"1,9d\" expect >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -ix with several instances of --exec">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard execute &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i --exec \"git show HEAD\" --exec \"pwd\" HEAD~2 >actual &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tFAKE_LINES=\"1 exec_git_show_HEAD exec_pwd 2\n"> <LIT_CHARS "\t\t\t\texec_git_show_HEAD exec_pwd\" &&\n"> <LIT_CHARS "\t\texport FAKE_LINES &&\n"> <LIT_CHARS "\t\tgit rebase -i HEAD~2 >expect\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\tsed -e \"1,11d\" expect >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -ix with --autosquash">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard execute &&\n"> <LIT_CHARS "\tgit checkout -b autosquash &&\n"> <LIT_CHARS "\techo second >second.txt &&\n"> <LIT_CHARS "\tgit add second.txt &&\n"> <LIT_CHARS "\tgit commit -m \"fixup! two_exec\" &&\n"> <LIT_CHARS "\techo bis >bis.txt &&\n"> <LIT_CHARS "\tgit add bis.txt &&\n"> <LIT_CHARS "\tgit commit -m \"fixup! two_exec\" &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tgit checkout -b autosquash_actual &&\n"> <LIT_CHARS "\t\tgit rebase -i --exec \"git show HEAD\" --autosquash HEAD~4 >actual\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\tgit checkout autosquash &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tgit checkout -b autosquash_expected &&\n"> <LIT_CHARS "\t\tFAKE_LINES=\"1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD\" &&\n"> <LIT_CHARS "\t\texport FAKE_LINES &&\n"> <LIT_CHARS "\t\tgit rebase -i HEAD~4 >expect\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\tsed -e \"1,13d\" expect >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase --exec works without -i ">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard execute &&\n"> <LIT_CHARS "\trm -rf exec_output &&\n"> <LIT_CHARS "\tEDITOR=\"echo >invoked_editor\" git rebase --exec \"echo a line >>exec_output\"  HEAD~2 2>actual &&\n"> <LIT_CHARS "\ttest_i18ngrep  \"Successfully rebased and updated\" actual &&\n"> <LIT_CHARS "\ttest_line_count = 2 exec_output &&\n"> <LIT_CHARS "\ttest_path_is_missing invoked_editor\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i --exec without <CMD>">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard execute &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail git rebase -i --exec 2>tmp &&\n"> <LIT_CHARS "\tsed -e \"1d\" tmp >actual &&\n"> <LIT_CHARS "\ttest_must_fail git rebase -h >expected &&\n"> <LIT_CHARS "\ttest_cmp expected actual &&\n"> <LIT_CHARS "\tgit checkout master\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i --root re-order and drop commits">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout E &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"3 1 2 5\" git rebase -i --root &&\n"> <LIT_CHARS "\ttest E = $(git cat-file commit HEAD | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest B = $(git cat-file commit HEAD^ | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest A = $(git cat-file commit HEAD^^ | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest C = $(git cat-file commit HEAD^^^ | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest 0 = $(git cat-file commit HEAD^^^ | grep -c ^parent\\ )\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i --root retain root commit author and message">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout A &&\n"> <LIT_CHARS "\techo B >file7 &&\n"> <LIT_CHARS "\tgit add file7 &&\n"> <LIT_CHARS "\tGIT_AUTHOR_NAME=\"Twerp Snog\" git commit -m \"different author\" &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"2\" git rebase -i --root &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD | grep -q \"^author Twerp Snog\" &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD | grep -q \"^different author$\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i --root temporary sentinel commit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_LINES=\"2\" git rebase -i --root &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD | grep \"^tree 4b825dc642cb\" &&\n"> <LIT_CHARS "\tgit rebase --abort\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i --root fixup root commit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout B &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 fixup 2\" git rebase -i --root &&\n"> <LIT_CHARS "\ttest A = $(git cat-file commit HEAD | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest B = $(git show HEAD:file1) &&\n"> <LIT_CHARS "\ttest 0 = $(git cat-file commit HEAD | grep -c ^parent\\ )\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase --edit-todo does not works on non-interactive rebase">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout conflict-branch &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail git rebase --onto HEAD~2 HEAD~ &&\n"> <LIT_CHARS "\ttest_must_fail git rebase --edit-todo &&\n"> <LIT_CHARS "\tgit rebase --abort\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase --edit-todo can be used to modify todo">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout no-conflict-branch^0 &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"edit 1 2 3\" git rebase -i HEAD~3 &&\n"> <LIT_CHARS "\tFAKE_LINES=\"2 1\" git rebase --edit-todo &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest M = $(git cat-file commit HEAD^ | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest L = $(git cat-file commit HEAD | sed -ne \\$p)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i produces readable reflog">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit branch -f branch-reflog-test H &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tgit rebase -i --onto I F branch-reflog-test &&\n"> <LIT_CHARS "\tcat >expect <<-\\EOF &&\n"> <LIT_CHARS "\trebase -i (finish): returning to refs/heads/branch-reflog-test\n"> <LIT_CHARS "\trebase -i (pick): H\n"> <LIT_CHARS "\trebase -i (pick): G\n"> <LIT_CHARS "\trebase -i (start): checkout I\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit reflog -n4 HEAD |\n"> <LIT_CHARS "\tsed \"s/[^:]*: //\" >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i respects core.commentchar">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout E^0 &&\n"> <LIT_CHARS "\ttest_config core.commentchar \"\\\\\" &&\n"> <LIT_CHARS "\twrite_script remove-all-but-first.sh <<-\\EOF &&\n"> <LIT_CHARS "\tsed -e \"2,\\$s/^/\\\\\\\\/\" \"$1\" >\"$1.tmp\" &&\n"> <LIT_CHARS "\tmv \"$1.tmp\" \"$1\"\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\ttest_set_editor \"$(pwd)/remove-all-but-first.sh\" &&\n"> <LIT_CHARS "\tgit rebase -i B &&\n"> <LIT_CHARS "\ttest B = $(git cat-file commit HEAD^ | sed -ne \\$p)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i, with <onto> and <upstream> specified as :/quuxery">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished \"git branch -D torebase\" &&\n"> <LIT_CHARS "\tgit checkout -b torebase branch1 &&\n"> <LIT_CHARS "\tupstream=$(git rev-parse \":/J\") &&\n"> <LIT_CHARS "\tonto=$(git rev-parse \":/A\") &&\n"> <LIT_CHARS "\tgit rebase --onto $onto $upstream &&\n"> <LIT_CHARS "\tgit reset --hard branch1 &&\n"> <LIT_CHARS "\tgit rebase --onto \":/A\" \":/J\" &&\n"> <LIT_CHARS "\tgit checkout branch1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i with --strategy and -X">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b conflict-merge-use-theirs conflict-branch &&\n"> <LIT_CHARS "\tgit reset --hard HEAD^ &&\n"> <LIT_CHARS "\techo five >conflict &&\n"> <LIT_CHARS "\techo Z >file1 &&\n"> <LIT_CHARS "\tgit commit -a -m \"one file conflict\" &&\n"> <LIT_CHARS "\tEDITOR=true git rebase -i --strategy=recursive -Xours conflict-branch &&\n"> <LIT_CHARS "\ttest $(git show conflict-branch:conflict) = $(cat conflict) &&\n"> <LIT_CHARS "\ttest $(cat file1) = Z\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "interrupted rebase -i with --strategy and -X">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b conflict-merge-use-theirs-interrupted conflict-branch &&\n"> <LIT_CHARS "\tgit reset --hard HEAD^ &&\n"> <LIT_CHARS "\t>breakpoint &&\n"> <LIT_CHARS "\tgit add breakpoint &&\n"> <LIT_CHARS "\tgit commit -m \"breakpoint for interactive mode\" &&\n"> <LIT_CHARS "\techo five >conflict &&\n"> <LIT_CHARS "\techo Z >file1 &&\n"> <LIT_CHARS "\tgit commit -a -m \"one file conflict\" &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"edit 1 2\" git rebase -i --strategy=recursive -Xours conflict-branch &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest $(git show conflict-branch:conflict) = $(cat conflict) &&\n"> <LIT_CHARS "\ttest $(cat file1) = Z\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i error on commits with \\ in message">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tcurrent_head=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\ttest_when_finished \"git rebase --abort; git reset --hard $current_head; rm -f error\" &&\n"> <LIT_CHARS "\ttest_commit TO-REMOVE will-conflict old-content &&\n"> <LIT_CHARS "\ttest_commit \"\\temp\" will-conflict new-content dummy &&\n"> <LIT_CHARS "\ttest_must_fail env EDITOR=true git rebase -i HEAD^ --onto HEAD^^ 2>error &&\n"> <LIT_CHARS "\ttest_expect_code 1 grep  \"\temp\" error\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "short SHA-1 setup">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished \"git checkout master\" &&\n"> <LIT_CHARS "\tgit checkout --orphan collide &&\n"> <LIT_CHARS "\tgit rm -rf . &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\tunset test_tick &&\n"> <LIT_CHARS "\ttest_commit collide1 collide &&\n"> <LIT_CHARS "\ttest_commit --notick collide2 collide &&\n"> <LIT_CHARS "\ttest_commit --notick collide3 collide\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "short SHA-1 collide">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_when_finished \"reset_rebase && git checkout master\" &&\n"> <LIT_CHARS "\tgit checkout collide &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\tunset test_tick &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_COMMIT_MESSAGE=\"collide2 ac4f2ee\" \\\n"> <LIT_CHARS "\tFAKE_LINES=\"reword 1 2\" git rebase -i HEAD~2\n"> <LIT_CHARS "\t)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "respect core.abbrev">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit config core.abbrev 12 &&\n"> <LIT_CHARS "\tset_cat_todo_editor &&\n"> <LIT_CHARS "\ttest_must_fail git rebase -i HEAD~4 >todo-list &&\n"> <LIT_CHARS "\ttest 4 = $(grep -c \"pick [0-9a-f]\\{12,\\}\" todo-list)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "todo count">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\twrite_script dump-raw.sh <<-\\EOF &&\n"> <LIT_CHARS "\t\tcat \"$1\"\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\ttest_set_editor \"$(pwd)/dump-raw.sh\" &&\n"> <LIT_CHARS "\tgit rebase -i HEAD~4 >actual &&\n"> <LIT_CHARS "\ttest_i18ngrep \"^# Rebase ..* onto ..* ([0-9]\" actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i commits that overwrite untracked files (pick)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout --force branch2 &&\n"> <LIT_CHARS "\tgit clean -f &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"edit 1 2\" git rebase -i A &&\n"> <LIT_CHARS "\ttest_cmp_rev HEAD F &&\n"> <LIT_CHARS "\ttest_path_is_missing file6 &&\n"> <LIT_CHARS "\t>file6 &&\n"> <LIT_CHARS "\ttest_must_fail git rebase --continue &&\n"> <LIT_CHARS "\ttest_cmp_rev HEAD F &&\n"> <LIT_CHARS "\trm file6 &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest_cmp_rev HEAD I\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i commits that overwrite untracked files (squash)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout --force branch2 &&\n"> <LIT_CHARS "\tgit clean -f &&\n"> <LIT_CHARS "\tgit tag original-branch2 &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"edit 1 squash 2\" git rebase -i A &&\n"> <LIT_CHARS "\ttest_cmp_rev HEAD F &&\n"> <LIT_CHARS "\ttest_path_is_missing file6 &&\n"> <LIT_CHARS "\t>file6 &&\n"> <LIT_CHARS "\ttest_must_fail git rebase --continue &&\n"> <LIT_CHARS "\ttest_cmp_rev HEAD F &&\n"> <LIT_CHARS "\trm file6 &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest $(git cat-file commit HEAD | sed -ne \\$p) = I &&\n"> <LIT_CHARS "\tgit reset --hard original-branch2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i commits that overwrite untracked files (no ff)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout --force branch2 &&\n"> <LIT_CHARS "\tgit clean -f &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"edit 1 2\" git rebase -i --no-ff A &&\n"> <LIT_CHARS "\ttest $(git cat-file commit HEAD | sed -ne \\$p) = F &&\n"> <LIT_CHARS "\ttest_path_is_missing file6 &&\n"> <LIT_CHARS "\t>file6 &&\n"> <LIT_CHARS "\ttest_must_fail git rebase --continue &&\n"> <LIT_CHARS "\ttest $(git cat-file commit HEAD | sed -ne \\$p) = F &&\n"> <LIT_CHARS "\trm file6 &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest $(git cat-file commit HEAD | sed -ne \\$p) = I\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase --continue removes CHERRY_PICK_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b commit-to-skip &&\n"> <LIT_CHARS "\tfor double in X 3 1\n"> <LIT_CHARS "\tdo\n"> <LIT_CHARS "\t\ttest_seq 5 | sed \"s/$double/&&/\" >seq &&\n"> <LIT_CHARS "\t\tgit add seq &&\n"> <LIT_CHARS "\t\ttest_tick &&\n"> <LIT_CHARS "\t\tgit commit -m seq-$double\n"> <LIT_CHARS "\tdone &&\n"> <LIT_CHARS "\tgit tag seq-onto &&\n"> <LIT_CHARS "\tgit reset --hard HEAD~2 &&\n"> <LIT_CHARS "\tgit cherry-pick seq-onto &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_LINES= git rebase -i seq-onto &&\n"> <LIT_CHARS "\ttest -d .git/rebase-merge &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\tgit diff --exit-code seq-onto &&\n"> <LIT_CHARS "\ttest ! -d .git/rebase-merge &&\n"> <LIT_CHARS "\ttest ! -f .git/CHERRY_PICK_HEAD\n">]})
  (FunctionDef rebase_setup_and_clean []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS test_when_finished]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "\t\tgit checkout master &&\n"][LIT_CHARS "\t\ttest_might_fail git branch -D "][VarSub 1][LIT_CHARS " &&\n"][LIT_CHARS "\t\ttest_might_fail git rebase --abort\n"][LIT_CHARS "\t"]]})
      (Com {[LIT_CHARS git]} {[LIT_CHARS checkout]} {[LIT_CHARS -b]} {[VarSub 1]} {[LIT_CHARS master]})
    )
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS drop>]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\trebase_setup_and_clean drop-test &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 drop 2 3 drop 4 5\" git rebase -i --root &&\n"> <LIT_CHARS "\ttest E = $(git cat-file commit HEAD | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest C = $(git cat-file commit HEAD^ | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest A = $(git cat-file commit HEAD^^ | sed -ne \\$p)\n">]})
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expect]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=True body_word={[DQ [LIT_CHARS "Successfully rebased and updated refs/heads/missing-commit.\n"]]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i respects rebase.missingCommitsCheck = ignore">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_config rebase.missingCommitsCheck ignore &&\n"> <LIT_CHARS "\trebase_setup_and_clean missing-commit &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 2 3 4\" \\\n"> <LIT_CHARS "\t\tgit rebase -i --root 2>actual &&\n"> <LIT_CHARS "\ttest D = $(git cat-file commit HEAD | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest_i18ncmp expect actual\n">]})
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expect]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=True body_word={[DQ [LIT_CHARS "Warning: some commits may have been dropped accidentally.\n"][LIT_CHARS "Dropped commits (newer to older):\n"][LIT_CHARS " - "][ComSub (Com {[LIT_CHARS git]} {[LIT_CHARS rev-list]} {[LIT_CHARS --pretty] [LIT_OTHER "="] [LIT_CHARS oneline]} {[LIT_CHARS --abbrev-commit]} {[LIT_CHARS -1]} {[LIT_CHARS master]})][LIT_CHARS "\n"][LIT_CHARS "To avoid this message, use "][RIGHT_D_QUOTE "\""][LIT_CHARS drop][RIGHT_D_QUOTE "\""][LIT_CHARS " to explicitly remove a commit.\n"][LIT_CHARS "\n"][LIT_CHARS "Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"][LIT_CHARS "The possible behaviours are: ignore, warn, error.\n"][LIT_CHARS "\n"][LIT_CHARS "Successfully rebased and updated refs/heads/missing-commit.\n"]]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i respects rebase.missingCommitsCheck = warn">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_config rebase.missingCommitsCheck warn &&\n"> <LIT_CHARS "\trebase_setup_and_clean missing-commit &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 2 3 4\" \\\n"> <LIT_CHARS "\t\tgit rebase -i --root 2>actual &&\n"> <LIT_CHARS "\ttest_i18ncmp expect actual &&\n"> <LIT_CHARS "\ttest D = $(git cat-file commit HEAD | sed -ne \\$p)\n">]})
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expect]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=True body_word={[DQ [LIT_CHARS "Warning: some commits may have been dropped accidentally.\n"][LIT_CHARS "Dropped commits (newer to older):\n"][LIT_CHARS " - "][ComSub (Com {[LIT_CHARS git]} {[LIT_CHARS rev-list]} {[LIT_CHARS --pretty] [LIT_OTHER "="] [LIT_CHARS oneline]} {[LIT_CHARS --abbrev-commit]} {[LIT_CHARS -1]} {[LIT_CHARS master]})][LIT_CHARS "\n"][LIT_CHARS " - "][ComSub (Com {[LIT_CHARS git]} {[LIT_CHARS rev-list]} {[LIT_CHARS --pretty] [LIT_OTHER "="] [LIT_CHARS oneline]} {[LIT_CHARS --abbrev-commit]} {[LIT_CHARS -1]} {[LIT_CHARS master] [LIT_TILDE "~"] [LIT_CHARS 2]})][LIT_CHARS "\n"][LIT_CHARS "To avoid this message, use "][RIGHT_D_QUOTE "\""][LIT_CHARS drop][RIGHT_D_QUOTE "\""][LIT_CHARS " to explicitly remove a commit.\n"][LIT_CHARS "\n"][LIT_CHARS "Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"][LIT_CHARS "The possible behaviours are: ignore, warn, error.\n"][LIT_CHARS "\n"][LIT_CHARS "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"][LIT_CHARS "Or you can abort the rebase with 'git rebase --abort'.\n"]]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i respects rebase.missingCommitsCheck = error">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_config rebase.missingCommitsCheck error &&\n"> <LIT_CHARS "\trebase_setup_and_clean missing-commit &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_LINES=\"1 2 4\" \\\n"> <LIT_CHARS "\t\tgit rebase -i --root 2>actual &&\n"> <LIT_CHARS "\ttest_i18ncmp expect actual &&\n"> <LIT_CHARS "\tcp .git/rebase-merge/git-rebase-todo.backup \\\n"> <LIT_CHARS "\t\t.git/rebase-merge/git-rebase-todo &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 2 drop 3 4 drop 5\" \\\n"> <LIT_CHARS "\t\tgit rebase --edit-todo &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest D = $(git cat-file commit HEAD | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest B = $(git cat-file commit HEAD^ | sed -ne \\$p)\n">]})
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expect]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=True body_word={[DQ [LIT_CHARS "Warning: the command isn't recognized in the following line:\n"][LIT_CHARS " - badcmd "][ComSub (Com {[LIT_CHARS git]} {[LIT_CHARS rev-list]} {[LIT_CHARS --oneline]} {[LIT_CHARS -1]} {[LIT_CHARS master] [LIT_TILDE "~"] [LIT_CHARS 1]})][LIT_CHARS "\n"][LIT_CHARS "\n"][LIT_CHARS "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"][LIT_CHARS "Or you can abort the rebase with 'git rebase --abort'.\n"]]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "static check of bad command">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\trebase_setup_and_clean bad-cmd &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_LINES=\"1 2 3 bad 4 5\" \\\n"> <LIT_CHARS "\t\tgit rebase -i --root 2>actual &&\n"> <LIT_CHARS "\ttest_i18ncmp expect actual &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 2 3 drop 4 5\" git rebase --edit-todo &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest E = $(git cat-file commit HEAD | sed -ne \\$p) &&\n"> <LIT_CHARS "\ttest C = $(git cat-file commit HEAD^ | sed -ne \\$p)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "tabs and spaces are accepted in the todolist">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\trebase_setup_and_clean indented-comment &&\n"> <LIT_CHARS "\twrite_script add-indent.sh <<-\\EOF &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\t# Turn single spaces into space/tab mix\n"> <LIT_CHARS "\t\tsed \"1s/ /\t/g; 2s/ /  /g; 3s/ / \t/g\" \"$1\"\n"> <LIT_CHARS "\t\tprintf \"\\n\\t# comment\\n #more\\n\\t # comment\\n\"\n"> <LIT_CHARS "\t) >\"$1.new\"\n"> <LIT_CHARS "\tmv \"$1.new\" \"$1\"\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\ttest_set_editor \"$(pwd)/add-indent.sh\" &&\n"> <LIT_CHARS "\tgit rebase -i HEAD^^^ &&\n"> <LIT_CHARS "\ttest E = $(git cat-file commit HEAD | sed -ne \\$p)\n">]})
  (Com {[LIT_CHARS cat]}
    <
    (FilenameRedirectNode filename={[LIT_CHARS expect]} <REDIR_GREAT ">"> 1),
    (HereDocRedirectNode here_end='EOF' do_expansion=True body_word={[DQ [LIT_CHARS "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"][LIT_CHARS " - edit XXXXXXX False commit\n"][LIT_CHARS "\n"][LIT_CHARS "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"][LIT_CHARS "Or you can abort the rebase with 'git rebase --abort'.\n"]]} <REDIR_DLESS "<<"> 0),
    >
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "static check of bad SHA-1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\trebase_setup_and_clean bad-sha &&\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\ttest_must_fail env FAKE_LINES=\"1 2 edit fakesha 3 4 5 #\" \\\n"> <LIT_CHARS "\t\tgit rebase -i --root 2>actual &&\n"> <LIT_CHARS "\ttest_i18ncmp expect actual &&\n"> <LIT_CHARS "\tFAKE_LINES=\"1 2 4 5 6\" git rebase --edit-todo &&\n"> <LIT_CHARS "\tgit rebase --continue &&\n"> <LIT_CHARS "\ttest E = $(git cat-file commit HEAD | sed -ne \\$p)\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "editor saves as CR/LF">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b with-crlf &&\n"> <LIT_CHARS "\twrite_script add-crs.sh <<-\\EOF &&\n"> <LIT_CHARS "\tsed -e \"s/\\$/Q/\" <\"$1\" | tr Q \"\\\\015\" >\"$1\".new &&\n"> <LIT_CHARS "\tmv -f \"$1\".new \"$1\"\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\ttest_set_editor \"$(pwd)/add-crs.sh\" &&\n"> <LIT_CHARS "\t\tgit rebase -i HEAD^\n"> <LIT_CHARS "\t)\n">]})
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('SQ', {[DQ [LIT_CHARS "'"]]})])
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rebase -i --gpg-sign=<key-id>">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tset_fake_editor &&\n"> <LIT_CHARS "\tFAKE_LINES=\"edit 1\" git rebase -i --gpg-sign=\"\\\"S I Gner\\\"\" HEAD^ \\\n"> <LIT_CHARS "\t\t>out 2>err &&\n"> <LIT_CHARS "\ttest_i18ngrep \"$SQ-S\\\"S I Gner\\\"$SQ\" err\n">]})
  (Com {[LIT_CHARS test_done]})
)