(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "test cherry-pick and revert with conflicts\n"> <LIT_CHARS "\n"> <LIT_CHARS "  -\n"> <LIT_CHARS "  + picked: rewrites foo to c\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]}  )
  (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]}        )
      )
    )
  )
  (FunctionDef pristine_detach []
    (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]}        )
      )
    )
  )
  (Com {[LIT_CHARS test_expect_success]} {[LIT_CHARS setup]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\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 picked foo c &&\n"> <LIT_CHARS "\ttest_commit --signoff picked-signed foo d &&\n"> <LIT_CHARS "\tgit config advice.detachedhead false\n"> <LIT_CHARS "\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "failed cherry-pick does not advance HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\thead=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick picked &&\n"> <LIT_CHARS "\tnewhead=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest \"$head\" = \"$newhead\"\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "advice from failed cherry-pick">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "\tpristine_detach initial &&\n"][LIT_CHARS "\n"][LIT_CHARS "\tpicked="][\ LIT_ESCAPED_CHAR "\\$"][LIT_CHARS "(git rev-parse --short picked) &&\n"][LIT_CHARS "\tcat <<-EOF >expected &&\n"][LIT_CHARS "\terror: could not apply "][\ LIT_ESCAPED_CHAR "\\$"][LIT_CHARS "picked... picked\n"][LIT_CHARS "\thint: after resolving the conflicts, mark the corrected paths\n"][LIT_CHARS "\thint: with 'git add <paths>' or 'git rm <paths>'\n"][LIT_CHARS "\thint: and commit the result with 'git commit'\n"][LIT_CHARS "\tEOF\n"][LIT_CHARS "\ttest_must_fail git cherry-pick picked 2>actual &&\n"][LIT_CHARS "\n"][LIT_CHARS "\ttest_i18ncmp expected actual\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "advice from failed cherry-pick --no-commit">]} {[DQ [LIT_CHARS "\n"][LIT_CHARS "\tpristine_detach initial &&\n"][LIT_CHARS "\n"][LIT_CHARS "\tpicked="][\ LIT_ESCAPED_CHAR "\\$"][LIT_CHARS "(git rev-parse --short picked) &&\n"][LIT_CHARS "\tcat <<-EOF >expected &&\n"][LIT_CHARS "\terror: could not apply "][\ LIT_ESCAPED_CHAR "\\$"][LIT_CHARS "picked... picked\n"][LIT_CHARS "\thint: after resolving the conflicts, mark the corrected paths\n"][LIT_CHARS "\thint: with 'git add <paths>' or 'git rm <paths>'\n"][LIT_CHARS "\tEOF\n"][LIT_CHARS "\ttest_must_fail git cherry-pick --no-commit picked 2>actual &&\n"][LIT_CHARS "\n"][LIT_CHARS "\ttest_i18ncmp expected actual\n"]]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "failed cherry-pick sets CHERRY_PICK_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick picked &&\n"> <LIT_CHARS "\ttest_cmp_rev picked CHERRY_PICK_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "successful cherry-pick does not set CHERRY_PICK_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\tgit cherry-pick base &&\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify CHERRY_PICK_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cherry-pick --no-commit does not set CHERRY_PICK_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\tgit cherry-pick --no-commit base &&\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify CHERRY_PICK_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\techo foo > foo &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick base &&\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify CHERRY_PICK_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\techo foo > foo &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick --strategy=resolve base &&\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify CHERRY_PICK_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tGIT_CHERRY_PICK_HELP=\"and then do something else\" &&\n"> <LIT_CHARS "\t\texport GIT_CHERRY_PICK_HELP &&\n"> <LIT_CHARS "\t\ttest_must_fail git cherry-pick picked\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify CHERRY_PICK_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git reset clears CHERRY_PICK_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick picked &&\n"> <LIT_CHARS "\tgit reset &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify CHERRY_PICK_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "failed commit does not clear CHERRY_PICK_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick picked &&\n"> <LIT_CHARS "\ttest_must_fail git commit &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_cmp_rev picked CHERRY_PICK_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "cancelled commit does not clear CHERRY_PICK_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick picked &&\n"> <LIT_CHARS "\techo resolved >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit update-index --refresh -q &&\n"> <LIT_CHARS "\ttest_must_fail git diff-index --exit-code HEAD &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tGIT_EDITOR=false &&\n"> <LIT_CHARS "\t\texport GIT_EDITOR &&\n"> <LIT_CHARS "\t\ttest_must_fail git commit\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_cmp_rev picked CHERRY_PICK_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "successful commit clears CHERRY_PICK_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick picked &&\n"> <LIT_CHARS "\techo resolved >foo &&\n"> <LIT_CHARS "\tgit add foo &&\n"> <LIT_CHARS "\tgit commit &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify CHERRY_PICK_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "failed cherry-pick produces dirty index">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick picked &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git update-index --refresh -q &&\n"> <LIT_CHARS "\ttest_must_fail git diff-index --exit-code HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "failed cherry-pick registers participants in index">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\t{\n"> <LIT_CHARS "\t\tgit checkout base -- foo &&\n"> <LIT_CHARS "\t\tgit ls-files --stage foo &&\n"> <LIT_CHARS "\t\tgit checkout initial -- foo &&\n"> <LIT_CHARS "\t\tgit ls-files --stage foo &&\n"> <LIT_CHARS "\t\tgit checkout picked -- foo &&\n"> <LIT_CHARS "\t\tgit ls-files --stage foo\n"> <LIT_CHARS "\t} > stages &&\n"> <LIT_CHARS "\tsed \"\n"> <LIT_CHARS "\t\t1 s/ 0\t/ 1\t/\n"> <LIT_CHARS "\t\t2 s/ 0\t/ 2\t/\n"> <LIT_CHARS "\t\t3 s/ 0\t/ 3\t/\n"> <LIT_CHARS "\t\" < stages > expected &&\n"> <LIT_CHARS "\tgit read-tree -u --reset HEAD &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick picked &&\n"> <LIT_CHARS "\tgit ls-files --stage --unmerged > actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "failed cherry-pick describes conflict in work tree">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\tcat <<-EOF > expected &&\n"> <LIT_CHARS "\t<<<<<<< HEAD\n"> <LIT_CHARS "\ta\n"> <LIT_CHARS "\t=======\n"> <LIT_CHARS "\tc\n"> <LIT_CHARS "\t>>>>>>> objid picked\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick picked &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tsed \"s/[a-f0-9]*\\.\\.\\./objid/\" foo > actual &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "diff3 -m style">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\tgit config merge.conflictstyle diff3 &&\n"> <LIT_CHARS "\tcat <<-EOF > expected &&\n"> <LIT_CHARS "\t<<<<<<< HEAD\n"> <LIT_CHARS "\ta\n"> <LIT_CHARS "\t||||||| parent of objid picked\n"> <LIT_CHARS "\tb\n"> <LIT_CHARS "\t=======\n"> <LIT_CHARS "\tc\n"> <LIT_CHARS "\t>>>>>>> objid picked\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick picked &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tsed \"s/[a-f0-9]*\\.\\.\\./objid/\" foo > actual &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "revert also handles conflicts sanely">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit config --unset merge.conflictstyle &&\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\tcat <<-EOF > expected &&\n"> <LIT_CHARS "\t<<<<<<< HEAD\n"> <LIT_CHARS "\ta\n"> <LIT_CHARS "\t=======\n"> <LIT_CHARS "\tb\n"> <LIT_CHARS "\t>>>>>>> parent of objid picked\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\t{\n"> <LIT_CHARS "\t\tgit checkout picked -- foo &&\n"> <LIT_CHARS "\t\tgit ls-files --stage foo &&\n"> <LIT_CHARS "\t\tgit checkout initial -- foo &&\n"> <LIT_CHARS "\t\tgit ls-files --stage foo &&\n"> <LIT_CHARS "\t\tgit checkout base -- foo &&\n"> <LIT_CHARS "\t\tgit ls-files --stage foo\n"> <LIT_CHARS "\t} > stages &&\n"> <LIT_CHARS "\tsed \"\n"> <LIT_CHARS "\t\t1 s/ 0\t/ 1\t/\n"> <LIT_CHARS "\t\t2 s/ 0\t/ 2\t/\n"> <LIT_CHARS "\t\t3 s/ 0\t/ 3\t/\n"> <LIT_CHARS "\t\" < stages > expected-stages &&\n"> <LIT_CHARS "\tgit read-tree -u --reset HEAD &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\thead=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\ttest_must_fail git revert picked &&\n"> <LIT_CHARS "\tnewhead=$(git rev-parse HEAD) &&\n"> <LIT_CHARS "\tgit ls-files --stage --unmerged > actual-stages &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest \"$head\" = \"$newhead\" &&\n"> <LIT_CHARS "\ttest_must_fail git update-index --refresh -q &&\n"> <LIT_CHARS "\ttest_must_fail git diff-index --exit-code HEAD &&\n"> <LIT_CHARS "\ttest_cmp expected-stages actual-stages &&\n"> <LIT_CHARS "\tsed \"s/[a-f0-9]*\\.\\.\\./objid/\" foo > actual &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "failed revert sets REVERT_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git revert picked &&\n"> <LIT_CHARS "\ttest_cmp_rev picked REVERT_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "successful revert does not set REVERT_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach base &&\n"> <LIT_CHARS "\tgit revert base &&\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 "revert --no-commit sets REVERT_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach base &&\n"> <LIT_CHARS "\tgit revert --no-commit base &&\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&\n"> <LIT_CHARS "\ttest_cmp_rev base REVERT_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "revert w/dirty tree does not set REVERT_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach base &&\n"> <LIT_CHARS "\techo foo > foo &&\n"> <LIT_CHARS "\ttest_must_fail git revert base &&\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 "GIT_CHERRY_PICK_HELP does not suppress REVERT_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\t(\n"> <LIT_CHARS "\t\tGIT_CHERRY_PICK_HELP=\"and then do something else\" &&\n"> <LIT_CHARS "\t\tGIT_REVERT_HELP=\"and then do something else, again\" &&\n"> <LIT_CHARS "\t\texport GIT_CHERRY_PICK_HELP GIT_REVERT_HELP &&\n"> <LIT_CHARS "\t\ttest_must_fail git revert picked\n"> <LIT_CHARS "\t) &&\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&\n"> <LIT_CHARS "\ttest_cmp_rev picked REVERT_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "git reset clears REVERT_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git revert picked &&\n"> <LIT_CHARS "\tgit reset &&\n"> <LIT_CHARS "\ttest_must_fail git rev-parse --verify REVERT_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "failed commit does not clear REVERT_HEAD">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git revert picked &&\n"> <LIT_CHARS "\ttest_must_fail git commit &&\n"> <LIT_CHARS "\ttest_cmp_rev picked REVERT_HEAD\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "revert conflict, diff3 -m style">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\tgit config merge.conflictstyle diff3 &&\n"> <LIT_CHARS "\tcat <<-EOF > expected &&\n"> <LIT_CHARS "\t<<<<<<< HEAD\n"> <LIT_CHARS "\ta\n"> <LIT_CHARS "\t||||||| objid picked\n"> <LIT_CHARS "\tc\n"> <LIT_CHARS "\t=======\n"> <LIT_CHARS "\tb\n"> <LIT_CHARS "\t>>>>>>> parent of objid picked\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git revert picked &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tsed \"s/[a-f0-9]*\\.\\.\\./objid/\" foo > actual &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "failed cherry-pick does not forget -s">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick -s picked &&\n"> <LIT_CHARS "\ttest_i18ngrep -e \"Signed-off-by\" .git/MERGE_MSG\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "commit after failed cherry-pick does not add duplicated -s">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick -s picked-signed &&\n"> <LIT_CHARS "\tgit commit -a -s &&\n"> <LIT_CHARS "\ttest $(git show -s |grep -c \"Signed-off-by\") = 1\n">]}  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "commit after failed cherry-pick adds -s at the right place">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tpristine_detach initial &&\n"> <LIT_CHARS "\ttest_must_fail git cherry-pick picked &&\n"> <LIT_CHARS "\tgit commit -a -s &&\n"> <LIT_CHARS "\tpwd &&\n"> <LIT_CHARS "\tcat <<EOF > expected &&\n"> <LIT_CHARS "picked\n"> <LIT_CHARS "\n"> <LIT_CHARS "Signed-off-by: C O Mitter <committer@example.com>\n"> <LIT_CHARS "\n"> <LIT_CHARS "Conflicts:\n"> <LIT_CHARS "\tfoo\n"> <LIT_CHARS "EOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit show -s --pretty=format:%B > actual &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]}  )
  (Com {[LIT_CHARS test_done]}  )
)