(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "Test cherry-pick continuation features\n"> <LIT_CHARS "\n"> <LIT_CHARS " +  conflicting: rewrites unrelated to conflicting\n"> <LIT_CHARS "  + yetanotherpick: rewrites foo to e\n"> <LIT_CHARS "  + anotherpick: rewrites foo to d\n"> <LIT_CHARS "  + picked: rewrites foo to c\n"> <LIT_CHARS "  + unrelatedpick: rewrites unrelated to reallyunrelated\n"> <LIT_CHARS "  + base: rewrites foo to b\n"> <LIT_CHARS "  + initial: writes foo as a, unrelated as unrelated\n"> <LIT_CHARS "\n">]})])
  (Com {[LIT_CHARS .]} {[LIT_CHARS ./test-lib.sh]}  )
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('_r10', {[SQ <LIT_CHARS "\\1\\1\\1\\1\\1\\1\\1\\1\\1\\1">]})])
  (FunctionDef pristine_detach []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS git]} {[LIT_CHARS cherry-pick]} {[LIT_CHARS --quit]}      )
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS git]} {[LIT_CHARS checkout]} {[LIT_CHARS -f]} {[DQ [VarSub 1][LIT_CHARS "^0"]]}        )
        (AndOr OP_AND_IF
          (Com {[LIT_CHARS git]} {[LIT_CHARS read-tree]} {[LIT_CHARS -u]} {[LIT_CHARS --reset]} {[LIT_CHARS HEAD]}          )
          (Com {[LIT_CHARS git]} {[LIT_CHARS clean]} {[LIT_CHARS -d]} {[LIT_CHARS -f]} {[LIT_CHARS -f]} {[LIT_CHARS -q]} {[LIT_CHARS -x]}          )
        )
      )
    )
  )
  (FunctionDef test_cmp_rev []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS git]} {[LIT_CHARS rev-parse]} {[LIT_CHARS --verify]} {[DQ [VarSub 1]]}
        <
        (FilenameRedirectNode filename={[LIT_CHARS expect.rev]} <REDIR_GREAT ">"> 1),
        >
      )
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS git]} {[LIT_CHARS rev-parse]} {[LIT_CHARS --verify]} {[DQ [VarSub 2]]}
          <
          (FilenameRedirectNode filename={[LIT_CHARS actual.rev]} <REDIR_GREAT ">"> 1),
          >
        )
        (Com {[LIT_CHARS test_cmp]} {[LIT_CHARS expect.rev]} {[LIT_CHARS actual.rev]}        )
      )
    )
  )
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS setup]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit config advice.detachedhead false &&\n"> <LIT_CHARS "\techo unrelated >unrelated &&\n"> <LIT_CHARS "\tgit add unrelated &&\n"> <LIT_CHARS "\ttest_commit initial foo a &&\n"> <LIT_CHARS "\ttest_commit base foo b &&\n"> <LIT_CHARS "\ttest_commit unrelatedpick unrelated reallyunrelated &&\n"> <LIT_CHARS "\ttest_commit picked foo c &&\n"> <LIT_CHARS "\ttest_commit anotherpick foo d &&\n"> <LIT_CHARS "\ttest_commit yetanotherpick foo e &&\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_commit conflicting unrelated\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cherry-pick persists data on failure">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick -s base..anotherpick &&\n"> <LIT_CHARS "\ttest_path_is_dir .git/sequencer &&\n"> <LIT_CHARS "\ttest_path_is_file .git/sequencer/head &&\n"> <LIT_CHARS "\ttest_path_is_file .git/sequencer/todo &&\n"> <LIT_CHARS "\ttest_path_is_file .git/sequencer/opts\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cherry-pick mid-cherry-pick-sequence">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick base..anotherpick &&\n"> <LIT_CHARS "\ttest_cmp_rev picked CHERRY_PICK_HEAD &&\n"> <LIT_CHARS "\t# \"oops, I forgot that these patches rely on the change from base\"\n"> <LIT_CHARS "\tgit checkout HEAD foo &&\n"> <LIT_CHARS "\tgit cherry-pick base &&\n"> <LIT_CHARS "\tgit cherry-pick picked &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\tgit diff --exit-code anotherpick\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cherry-pick persists opts correctly">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 128 git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours initial..anotherpick &&\n"> <LIT_CHARS "\ttest_path_is_dir .git/sequencer &&\n"> <LIT_CHARS "\ttest_path_is_file .git/sequencer/head &&\n"> <LIT_CHARS "\ttest_path_is_file .git/sequencer/todo &&\n"> <LIT_CHARS "\ttest_path_is_file .git/sequencer/opts &&\n"> <LIT_CHARS "\techo \"true\" >expect &&\n"> <LIT_CHARS "\tgit config --file=.git/sequencer/opts --get-all options.signoff >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\techo \"1\" >expect &&\n"> <LIT_CHARS "\tgit config --file=.git/sequencer/opts --get-all options.mainline >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\techo \"recursive\" >expect &&\n"> <LIT_CHARS "\tgit config --file=.git/sequencer/opts --get-all options.strategy >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\tcat >expect <<-\\EOF &&\n"> <LIT_CHARS "\tpatience\n"> <LIT_CHARS "\tours\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit config --file=.git/sequencer/opts --get-all options.strategy-option >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cherry-pick cleans up sequencer state upon success">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\tgit cherry-pick initial..picked &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--quit does not complain when no cherry-pick is in progress">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\tgit cherry-pick --quit\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--abort requires cherry-pick in progress">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick --abort\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--quit cleans up sequencer state">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..picked &&\n"> <LIT_CHARS "\tgit cherry-pick --quit &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--quit keeps HEAD and conflicted index intact">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\tcat >expect <<-\\EOF &&\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:100644 100644 OBJID OBJID M\tunrelated\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:000000 100644 OBJID OBJID A\tfoo\n"> <LIT_CHARS "\t:000000 100644 OBJID OBJID A\tunrelated\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..picked &&\n"> <LIT_CHARS "\tgit cherry-pick --quit &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\ttest_must_fail git update-index --refresh &&\n"> <LIT_CHARS "\t{\n"> <LIT_CHARS "\t\tgit rev-list HEAD |\n"> <LIT_CHARS "\t\tgit diff-tree --root --stdin |\n"> <LIT_CHARS "\t\tsed \"s/$_x40/OBJID/g\"\n"> <LIT_CHARS "\t} >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--abort to cancel multiple cherry-pick">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..anotherpick &&\n"> <LIT_CHARS "\tgit cherry-pick --abort &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\ttest_cmp_rev initial HEAD &&\n"> <LIT_CHARS "\tgit update-index --refresh &&\n"> <LIT_CHARS "\tgit diff-index --exit-code HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--abort to cancel single cherry-pick">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick picked &&\n"> <LIT_CHARS "\tgit cherry-pick --abort &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\ttest_cmp_rev initial HEAD &&\n"> <LIT_CHARS "\tgit update-index --refresh &&\n"> <LIT_CHARS "\tgit diff-index --exit-code HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cherry-pick --abort to cancel multiple revert">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach anotherpick &&\n"> <LIT_CHARS "\ttest_expect_code 1 git revert base..picked &&\n"> <LIT_CHARS "\tgit cherry-pick --abort &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\ttest_cmp_rev anotherpick HEAD &&\n"> <LIT_CHARS "\tgit update-index --refresh &&\n"> <LIT_CHARS "\tgit diff-index --exit-code HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "revert --abort works, too">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach anotherpick &&\n"> <LIT_CHARS "\ttest_expect_code 1 git revert base..picked &&\n"> <LIT_CHARS "\tgit revert --abort &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\ttest_cmp_rev anotherpick HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--abort to cancel single revert">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach anotherpick &&\n"> <LIT_CHARS "\ttest_expect_code 1 git revert picked &&\n"> <LIT_CHARS "\tgit revert --abort &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\ttest_cmp_rev anotherpick HEAD &&\n"> <LIT_CHARS "\tgit update-index --refresh &&\n"> <LIT_CHARS "\tgit diff-index --exit-code HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--abort keeps unrelated change, easy case">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach unrelatedpick &&\n"> <LIT_CHARS "\techo changed >expect &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick picked..yetanotherpick &&\n"> <LIT_CHARS "\techo changed >unrelated &&\n"> <LIT_CHARS "\tgit cherry-pick --abort &&\n"> <LIT_CHARS "\ttest_cmp expect unrelated\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--abort refuses to clobber unrelated change, harder case">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\techo changed >expect &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..anotherpick &&\n"> <LIT_CHARS "\techo changed >unrelated &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick --abort &&\n"> <LIT_CHARS "\ttest_cmp expect unrelated &&\n"> <LIT_CHARS "\tgit rev-list HEAD >log &&\n"> <LIT_CHARS "\ttest_line_count = 2 log &&\n"> <LIT_CHARS "\ttest_must_fail git update-index --refresh &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout unrelated &&\n"> <LIT_CHARS "\tgit cherry-pick --abort &&\n"> <LIT_CHARS "\ttest_cmp_rev initial HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cherry-pick still writes sequencer state when one commit is left">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..picked &&\n"> <LIT_CHARS "\ttest_path_is_dir .git/sequencer &&\n"> <LIT_CHARS "\techo \"resolved\" >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit commit &&\n"> <LIT_CHARS "\t{\n"> <LIT_CHARS "\t\tgit rev-list HEAD |\n"> <LIT_CHARS "\t\tgit diff-tree --root --stdin |\n"> <LIT_CHARS "\t\tsed \"s/$_x40/OBJID/g\"\n"> <LIT_CHARS "\t} >actual &&\n"> <LIT_CHARS "\tcat >expect <<-\\EOF &&\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:100644 100644 OBJID OBJID M\tfoo\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:100644 100644 OBJID OBJID M\tunrelated\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:000000 100644 OBJID OBJID A\tfoo\n"> <LIT_CHARS "\t:000000 100644 OBJID OBJID A\tunrelated\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--abort after last commit in sequence">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..picked &&\n"> <LIT_CHARS "\tgit cherry-pick --abort &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\ttest_cmp_rev initial HEAD &&\n"> <LIT_CHARS "\tgit update-index --refresh &&\n"> <LIT_CHARS "\tgit diff-index --exit-code HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cherry-pick does not implicitly stomp an existing operation">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..anotherpick &&\n"> <LIT_CHARS "\ttest-chmtime -v +0 .git/sequencer >expect &&\n"> <LIT_CHARS "\ttest_expect_code 128 git cherry-pick unrelatedpick &&\n"> <LIT_CHARS "\ttest-chmtime -v +0 .git/sequencer >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--continue complains when no cherry-pick is in progress">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 128 git cherry-pick --continue\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--continue complains when there are unresolved conflicts">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..anotherpick &&\n"> <LIT_CHARS "\ttest_expect_code 128 git cherry-pick --continue\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--continue of single cherry-pick">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\techo c >expect &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick picked &&\n"> <LIT_CHARS "\techo c >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_cmp expect foo &&\n"> <LIT_CHARS "\ttest_cmp_rev initial HEAD^ &&\n"> <LIT_CHARS "\tgit diff --exit-code HEAD &&\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify CHERRY_PICK_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--continue of single revert">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\techo resolved >expect &&\n"> <LIT_CHARS "\techo \"Revert \\\"picked\\\"\" >expect.msg &&\n"> <LIT_CHARS "\ttest_must_fail git revert picked &&\n"> <LIT_CHARS "\techo resolved >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit diff --exit-code HEAD &&\n"> <LIT_CHARS "\ttest_cmp expect foo &&\n"> <LIT_CHARS "\ttest_cmp_rev initial HEAD^ &&\n"> <LIT_CHARS "\tgit diff-tree -s --pretty=tformat:%s HEAD >msg &&\n"> <LIT_CHARS "\ttest_cmp expect.msg msg &&\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify REVERT_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--continue after resolving conflicts">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\techo d >expect &&\n"> <LIT_CHARS "\tcat >expect.log <<-\\EOF &&\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:100644 100644 OBJID OBJID M\tfoo\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:100644 100644 OBJID OBJID M\tfoo\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:100644 100644 OBJID OBJID M\tunrelated\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:000000 100644 OBJID OBJID A\tfoo\n"> <LIT_CHARS "\t:000000 100644 OBJID OBJID A\tunrelated\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick base..anotherpick &&\n"> <LIT_CHARS "\techo c >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\t{\n"> <LIT_CHARS "\t\tgit rev-list HEAD |\n"> <LIT_CHARS "\t\tgit diff-tree --root --stdin |\n"> <LIT_CHARS "\t\tsed \"s/$_x40/OBJID/g\"\n"> <LIT_CHARS "\t} >actual.log &&\n"> <LIT_CHARS "\ttest_cmp expect foo &&\n"> <LIT_CHARS "\ttest_cmp expect.log actual.log\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--continue after resolving conflicts and committing">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..anotherpick &&\n"> <LIT_CHARS "\techo \"c\" >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit commit &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\t{\n"> <LIT_CHARS "\t\tgit rev-list HEAD |\n"> <LIT_CHARS "\t\tgit diff-tree --root --stdin |\n"> <LIT_CHARS "\t\tsed \"s/$_x40/OBJID/g\"\n"> <LIT_CHARS "\t} >actual &&\n"> <LIT_CHARS "\tcat >expect <<-\\EOF &&\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:100644 100644 OBJID OBJID M\tfoo\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:100644 100644 OBJID OBJID M\tfoo\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:100644 100644 OBJID OBJID M\tunrelated\n"> <LIT_CHARS "\tOBJID\n"> <LIT_CHARS "\t:000000 100644 OBJID OBJID A\tfoo\n"> <LIT_CHARS "\t:000000 100644 OBJID OBJID A\tunrelated\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--continue asks for help after resolving patch to nil">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach conflicting &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick initial..picked &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_cmp_rev unrelatedpick CHERRY_PICK_HEAD &&\n"> <LIT_CHARS "\tgit checkout HEAD -- unrelated &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick --continue 2>msg &&\n"> <LIT_CHARS "\ttest_i18ngrep \"The previous cherry-pick is now empty\" msg\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "follow advice and skip nil patch">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach conflicting &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick initial..picked &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout HEAD -- unrelated &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick --continue &&\n"> <LIT_CHARS "\tgit reset &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit rev-list initial..HEAD >commits &&\n"> <LIT_CHARS "\ttest_line_count = 3 commits\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--continue respects opts">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick -x base..anotherpick &&\n"> <LIT_CHARS "\techo \"c\" >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit commit &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD >anotherpick_msg &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD~1 >picked_msg &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD~2 >unrelatedpick_msg &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD~3 >initial_msg &&\n"> <LIT_CHARS "\ttest_must_fail grep \"cherry picked from\" initial_msg &&\n"> <LIT_CHARS "\tgrep \"cherry picked from\" unrelatedpick_msg &&\n"> <LIT_CHARS "\tgrep \"cherry picked from\" picked_msg &&\n"> <LIT_CHARS "\tgrep \"cherry picked from\" anotherpick_msg\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--continue of single-pick respects -x">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick -x picked &&\n"> <LIT_CHARS "\techo c >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD >msg &&\n"> <LIT_CHARS "\tgrep \"cherry picked from\" msg\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "--continue respects -x in first commit in multi-pick">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick -x picked anotherpick &&\n"> <LIT_CHARS "\techo c >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD^ >msg &&\n"> <LIT_CHARS "\tpicked=$(git rev-parse --verify picked) &&\n"> <LIT_CHARS "\tgrep \"cherry picked from.*$picked\" msg\n">]}  )
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "--signoff is automatically propagated to resolved conflict">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick --signoff base..anotherpick &&\n"> <LIT_CHARS "\techo \"c\" >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit commit &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD >anotherpick_msg &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD~1 >picked_msg &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD~2 >unrelatedpick_msg &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD~3 >initial_msg &&\n"> <LIT_CHARS "\ttest_must_fail grep \"Signed-off-by:\" initial_msg &&\n"> <LIT_CHARS "\tgrep \"Signed-off-by:\" unrelatedpick_msg &&\n"> <LIT_CHARS "\ttest_must_fail grep \"Signed-off-by:\" picked_msg &&\n"> <LIT_CHARS "\tgrep \"Signed-off-by:\" anotherpick_msg\n">]}  )
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "--signoff dropped for implicit commit of resolution, multi-pick case">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick -s picked anotherpick &&\n"> <LIT_CHARS "\techo c >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit diff --exit-code HEAD &&\n"> <LIT_CHARS "\ttest_cmp_rev initial HEAD^^ &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD^ >msg &&\n"> <LIT_CHARS "\t! grep Signed-off-by: msg\n">]}  )
  (Com {[LIT_CHARS test_expect_failure]} {[SQ <LIT_CHARS "sign-off needs to be reaffirmed after conflict resolution, single-pick case">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick -s picked &&\n"> <LIT_CHARS "\techo c >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit diff --exit-code HEAD &&\n"> <LIT_CHARS "\ttest_cmp_rev initial HEAD^ &&\n"> <LIT_CHARS "\tgit cat-file commit HEAD >msg &&\n"> <LIT_CHARS "\t! grep Signed-off-by: msg\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "malformed instruction sheet 1">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..anotherpick &&\n"> <LIT_CHARS "\techo \"resolved\" >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit commit &&\n"> <LIT_CHARS "\tsed \"s/pick /pick/\" .git/sequencer/todo >new_sheet &&\n"> <LIT_CHARS "\tcp new_sheet .git/sequencer/todo &&\n"> <LIT_CHARS "\ttest_expect_code 128 git cherry-pick --continue\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "malformed instruction sheet 2">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..anotherpick &&\n"> <LIT_CHARS "\techo \"resolved\" >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit commit &&\n"> <LIT_CHARS "\tsed \"s/pick/revert/\" .git/sequencer/todo >new_sheet &&\n"> <LIT_CHARS "\tcp new_sheet .git/sequencer/todo &&\n"> <LIT_CHARS "\ttest_expect_code 128 git cherry-pick --continue\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "empty commit set">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 128 git cherry-pick base..base\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "malformed instruction sheet 3">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..anotherpick &&\n"> <LIT_CHARS "\techo \"resolved\" >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit commit &&\n"> <LIT_CHARS "\tsed \"s/pick \\([0-9a-f]*\\)/pick $_r10/\" .git/sequencer/todo >new_sheet &&\n"> <LIT_CHARS "\tcp new_sheet .git/sequencer/todo &&\n"> <LIT_CHARS "\ttest_expect_code 128 git cherry-pick --continue\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "instruction sheet, fat-fingers version">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..anotherpick &&\n"> <LIT_CHARS "\techo \"c\" >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit commit &&\n"> <LIT_CHARS "\tsed \"s/pick \\([0-9a-f]*\\)/pick \t \\1 \t/\" .git/sequencer/todo >new_sheet &&\n"> <LIT_CHARS "\tcp new_sheet .git/sequencer/todo &&\n"> <LIT_CHARS "\tgit cherry-pick --continue\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "commit descriptions in insn sheet are optional">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_expect_code 1 git cherry-pick base..anotherpick &&\n"> <LIT_CHARS "\techo \"c\" >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit commit &&\n"> <LIT_CHARS "\tcut -d\" \" -f1,2 .git/sequencer/todo >new_sheet &&\n"> <LIT_CHARS "\tcp new_sheet .git/sequencer/todo &&\n"> <LIT_CHARS "\tgit cherry-pick --continue &&\n"> <LIT_CHARS "\ttest_path_is_missing .git/sequencer &&\n"> <LIT_CHARS "\tgit rev-list HEAD >commits &&\n"> <LIT_CHARS "\ttest_line_count = 4 commits\n">]}  )
  (Com {[LIT_CHARS test_done]}  )
)