(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "test aborting in-progress merges\n"> <LIT_CHARS "\n"> <LIT_CHARS "Set up repo with conflicting and non-conflicting branches:\n"> <LIT_CHARS "\n"> <LIT_CHARS "There are three files foo/bar/baz, and the following graph illustrates the\n"> <LIT_CHARS "content of these files in each commit:\n"> <LIT_CHARS "\n"> <LIT_CHARS "# foo/bar/baz --- foo/bar/bazz     <-- master\n"> <LIT_CHARS "#             \\\n"> <LIT_CHARS "#              --- foo/barf/bazf   <-- conflict_branch\n"> <LIT_CHARS "#               \\\n"> <LIT_CHARS "#                --- foo/bart/baz  <-- clean_branch\n"> <LIT_CHARS "\n"> <LIT_CHARS "Next, test git merge --abort with the following variables:\n"> <LIT_CHARS "- before/after successful merge (should fail when not in merge context)\n"> <LIT_CHARS "- with/without conflicts\n"> <LIT_CHARS "- clean/dirty index before merge\n"> <LIT_CHARS "- clean/dirty worktree before merge\n"> <LIT_CHARS "- dirty index before merge matches contents on remote branch\n"> <LIT_CHARS "- changed/unchanged worktree after merge\n"> <LIT_CHARS "- changed/unchanged index after merge\n">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS setup>]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t# Create the above repo\n"> <LIT_CHARS "\techo foo > foo &&\n"> <LIT_CHARS "\techo bar > bar &&\n"> <LIT_CHARS "\techo baz > baz &&\n"> <LIT_CHARS "\tgit add foo bar baz &&\n"> <LIT_CHARS "\tgit commit -m initial &&\n"> <LIT_CHARS "\techo bazz > baz &&\n"> <LIT_CHARS "\tgit commit -a -m \"second\" &&\n"> <LIT_CHARS "\tgit checkout -b conflict_branch HEAD^ &&\n"> <LIT_CHARS "\techo barf > bar &&\n"> <LIT_CHARS "\techo bazf > baz &&\n"> <LIT_CHARS "\tgit commit -a -m \"conflict\" &&\n"> <LIT_CHARS "\tgit checkout -b clean_branch HEAD^ &&\n"> <LIT_CHARS "\techo bart > bar &&\n"> <LIT_CHARS "\tgit commit -a -m \"clean\" &&\n"> <LIT_CHARS "\tgit checkout master\n">]})
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('pre_merge_head', {[DQ [ComSub (Com {[LIT_CHARS git]} {[LIT_CHARS rev-parse]} {[LIT_CHARS HEAD]})]]})])
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "fails without MERGE_HEAD (unstarted merge)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge --abort 2>output &&\n"> <LIT_CHARS "\ttest_i18ngrep MERGE_HEAD output\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "fails without MERGE_HEAD (completed merge)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge clean_branch &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\t# Merge successfully completed\n"> <LIT_CHARS "\tpost_merge_head=\"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\ttest_must_fail git merge --abort 2>output &&\n"> <LIT_CHARS "\ttest_i18ngrep MERGE_HEAD output\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$post_merge_head\" = \"$(git rev-parse HEAD)\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Forget previous merge">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard \"$pre_merge_head\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Abort after --no-commit">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t# Redo merge, but stop before creating merge commit\n"> <LIT_CHARS "\tgit merge --no-commit clean_branch &&\n"> <LIT_CHARS "\ttest -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\t# Abort non-conflicting merge\n"> <LIT_CHARS "\tgit merge --abort &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\ttest -z \"$(git diff)\" &&\n"> <LIT_CHARS "\ttest -z \"$(git diff --staged)\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Abort after conflicts">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t# Create conflicting merge\n"> <LIT_CHARS "\ttest_must_fail git merge conflict_branch &&\n"> <LIT_CHARS "\ttest -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\t# Abort conflicting merge\n"> <LIT_CHARS "\tgit merge --abort &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\ttest -z \"$(git diff)\" &&\n"> <LIT_CHARS "\ttest -z \"$(git diff --staged)\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Clean merge with dirty index fails">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo xyzzy >> foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit diff --staged > expect &&\n"> <LIT_CHARS "\ttest_must_fail git merge clean_branch &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\ttest -z \"$(git diff)\" &&\n"> <LIT_CHARS "\tgit diff --staged > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Conflicting merge with dirty index fails">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge conflict_branch &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\ttest -z \"$(git diff)\" &&\n"> <LIT_CHARS "\tgit diff --staged > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Reset index (but preserve worktree changes)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset \"$pre_merge_head\" &&\n"> <LIT_CHARS "\tgit diff > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Abort clean merge with non-conflicting dirty worktree">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit merge --no-commit clean_branch &&\n"> <LIT_CHARS "\ttest -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\t# Abort merge\n"> <LIT_CHARS "\tgit merge --abort &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\ttest -z \"$(git diff --staged)\" &&\n"> <LIT_CHARS "\tgit diff > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Abort conflicting merge with non-conflicting dirty worktree">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge conflict_branch &&\n"> <LIT_CHARS "\ttest -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\t# Abort merge\n"> <LIT_CHARS "\tgit merge --abort &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\ttest -z \"$(git diff --staged)\" &&\n"> <LIT_CHARS "\tgit diff > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Reset worktree changes">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard \"$pre_merge_head\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Fail clean merge with conflicting dirty worktree">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo xyzzy >> bar &&\n"> <LIT_CHARS "\tgit diff > expect &&\n"> <LIT_CHARS "\ttest_must_fail git merge --no-commit clean_branch &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\ttest -z \"$(git diff --staged)\" &&\n"> <LIT_CHARS "\tgit diff > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Fail conflicting merge with conflicting dirty worktree">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge conflict_branch &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\ttest -z \"$(git diff --staged)\" &&\n"> <LIT_CHARS "\tgit diff > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Reset worktree changes">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard \"$pre_merge_head\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Fail clean merge with matching dirty worktree">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo bart > bar &&\n"> <LIT_CHARS "\tgit diff > expect &&\n"> <LIT_CHARS "\ttest_must_fail git merge --no-commit clean_branch &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\ttest -z \"$(git diff --staged)\" &&\n"> <LIT_CHARS "\tgit diff > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Abort clean merge with matching dirty index">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit add bar &&\n"> <LIT_CHARS "\tgit diff --staged > expect &&\n"> <LIT_CHARS "\tgit merge --no-commit clean_branch &&\n"> <LIT_CHARS "\ttest -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\t### When aborting the merge, git will discard all staged changes,\n"> <LIT_CHARS "\t### including those that were staged pre-merge. In other words,\n"> <LIT_CHARS "\t### --abort will LOSE any staged changes (the staged changes that\n"> <LIT_CHARS "\t### are lost must match the merge result, or the merge would not\n"> <LIT_CHARS "\t### have been allowed to start). Change expectations accordingly:\n"> <LIT_CHARS "\trm expect &&\n"> <LIT_CHARS "\ttouch expect &&\n"> <LIT_CHARS "\t# Abort merge\n"> <LIT_CHARS "\tgit merge --abort &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\tgit diff --staged > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\ttest -z \"$(git diff)\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Reset worktree changes">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard \"$pre_merge_head\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Fail conflicting merge with matching dirty worktree">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo barf > bar &&\n"> <LIT_CHARS "\tgit diff > expect &&\n"> <LIT_CHARS "\ttest_must_fail git merge conflict_branch &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\ttest -z \"$(git diff --staged)\" &&\n"> <LIT_CHARS "\tgit diff > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Abort conflicting merge with matching dirty index">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit add bar &&\n"> <LIT_CHARS "\tgit diff --staged > expect &&\n"> <LIT_CHARS "\ttest_must_fail git merge conflict_branch &&\n"> <LIT_CHARS "\ttest -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\t### When aborting the merge, git will discard all staged changes,\n"> <LIT_CHARS "\t### including those that were staged pre-merge. In other words,\n"> <LIT_CHARS "\t### --abort will LOSE any staged changes (the staged changes that\n"> <LIT_CHARS "\t### are lost must match the merge result, or the merge would not\n"> <LIT_CHARS "\t### have been allowed to start). Change expectations accordingly:\n"> <LIT_CHARS "\trm expect &&\n"> <LIT_CHARS "\ttouch expect &&\n"> <LIT_CHARS "\t# Abort merge\n"> <LIT_CHARS "\tgit merge --abort &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\tgit diff --staged > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\ttest -z \"$(git diff)\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Reset worktree changes">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard \"$pre_merge_head\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Abort merge with pre- and post-merge worktree changes">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t# Pre-merge worktree changes\n"> <LIT_CHARS "\techo xyzzy > foo &&\n"> <LIT_CHARS "\techo barf > bar &&\n"> <LIT_CHARS "\tgit add bar &&\n"> <LIT_CHARS "\tgit diff > expect &&\n"> <LIT_CHARS "\tgit diff --staged > expect-staged &&\n"> <LIT_CHARS "\t# Perform merge\n"> <LIT_CHARS "\ttest_must_fail git merge conflict_branch &&\n"> <LIT_CHARS "\ttest -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\t# Post-merge worktree changes\n"> <LIT_CHARS "\techo yzxxz > foo &&\n"> <LIT_CHARS "\techo blech > baz &&\n"> <LIT_CHARS "\t### When aborting the merge, git will discard staged changes (bar)\n"> <LIT_CHARS "\t### and unmerged changes (baz). Other changes that are neither\n"> <LIT_CHARS "\t### staged nor marked as unmerged (foo), will be preserved. For\n"> <LIT_CHARS "\t### these changed, git cannot tell pre-merge changes apart from\n"> <LIT_CHARS "\t### post-merge changes, so the post-merge changes will be\n"> <LIT_CHARS "\t### preserved. Change expectations accordingly:\n"> <LIT_CHARS "\tgit diff -- foo > expect &&\n"> <LIT_CHARS "\trm expect-staged &&\n"> <LIT_CHARS "\ttouch expect-staged &&\n"> <LIT_CHARS "\t# Abort merge\n"> <LIT_CHARS "\tgit merge --abort &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\tgit diff > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\tgit diff --staged > actual-staged &&\n"> <LIT_CHARS "\ttest_cmp expect-staged actual-staged\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Reset worktree changes">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard \"$pre_merge_head\"\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "Abort merge with pre- and post-merge index changes">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t# Pre-merge worktree changes\n"> <LIT_CHARS "\techo xyzzy > foo &&\n"> <LIT_CHARS "\techo barf > bar &&\n"> <LIT_CHARS "\tgit add bar &&\n"> <LIT_CHARS "\tgit diff > expect &&\n"> <LIT_CHARS "\tgit diff --staged > expect-staged &&\n"> <LIT_CHARS "\t# Perform merge\n"> <LIT_CHARS "\ttest_must_fail git merge conflict_branch &&\n"> <LIT_CHARS "\ttest -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\t# Post-merge worktree changes\n"> <LIT_CHARS "\techo yzxxz > foo &&\n"> <LIT_CHARS "\techo blech > baz &&\n"> <LIT_CHARS "\tgit add foo bar &&\n"> <LIT_CHARS "\t### When aborting the merge, git will discard all staged changes\n"> <LIT_CHARS "\t### (foo, bar and baz), and no changes will be preserved. Whether\n"> <LIT_CHARS "\t### the changes were staged pre- or post-merge does not matter\n"> <LIT_CHARS "\t### (except for not preventing starting the merge).\n"> <LIT_CHARS "\t### Change expectations accordingly:\n"> <LIT_CHARS "\trm expect expect-staged &&\n"> <LIT_CHARS "\ttouch expect &&\n"> <LIT_CHARS "\ttouch expect-staged &&\n"> <LIT_CHARS "\t# Abort merge\n"> <LIT_CHARS "\tgit merge --abort &&\n"> <LIT_CHARS "\ttest ! -f .git/MERGE_HEAD &&\n"> <LIT_CHARS "\ttest \"$pre_merge_head\" = \"$(git rev-parse HEAD)\" &&\n"> <LIT_CHARS "\tgit diff > actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\tgit diff --staged > actual-staged &&\n"> <LIT_CHARS "\ttest_cmp expect-staged actual-staged\n">]})
  (Com {[LIT_CHARS test_done]})
)