(List
  (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('test_description', {[SQ <LIT_CHARS "git rerere\n"> <LIT_CHARS "\n"> <LIT_CHARS "! [fifth] version1\n"> <LIT_CHARS " ! [first] first\n"> <LIT_CHARS "  ! [fourth] version1\n"> <LIT_CHARS "   ! [master] initial\n"> <LIT_CHARS "    ! [second] prefer first over second\n"> <LIT_CHARS "     ! [third] version2\n"> <LIT_CHARS "------\n"> <LIT_CHARS "     + [third] version2\n"> <LIT_CHARS "+      [fifth] version1\n"> <LIT_CHARS "  +    [fourth] version1\n"> <LIT_CHARS "+ +  + [third^] third\n"> <LIT_CHARS "    -  [second] prefer first over second\n"> <LIT_CHARS " +  +  [first] first\n"> <LIT_CHARS "    +  [second^] second\n"> <LIT_CHARS "++++++ [master] initial\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 "\tcat >a1 <<-\\EOF &&\n"> <LIT_CHARS "\tSome title\n"> <LIT_CHARS "\t==========\n"> <LIT_CHARS "\tWhether ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "tis nobler in the mind to suffer\n"> <LIT_CHARS "\tThe slings and arrows of outrageous fortune,\n"> <LIT_CHARS "\tOr to take arms against a sea of troubles,\n"> <LIT_CHARS "\tAnd by opposing end them? To die: to sleep;\n"> <LIT_CHARS "\tNo more; and by a sleep to say we end\n"> <LIT_CHARS "\tThe heart-ache and the thousand natural shocks\n"> <LIT_CHARS "\tThat flesh is heir to, ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "tis a consummation\n"> <LIT_CHARS "\tDevoutly to be wish">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "d.\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit add a1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -q -a -m initial &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcat >>a1 <<-\\EOF &&\n"> <LIT_CHARS "\tSome title\n"> <LIT_CHARS "\t==========\n"> <LIT_CHARS "\tTo die, to sleep;\n"> <LIT_CHARS "\tTo sleep: perchance to dream: ay, there">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s the rub;\n"> <LIT_CHARS "\tFor in that sleep of death what dreams may come\n"> <LIT_CHARS "\tWhen we have shuffled off this mortal coil,\n"> <LIT_CHARS "\tMust give us pause: there">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s the respect\n"> <LIT_CHARS "\tThat makes calamity of so long life;\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b first &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -q -a -m first &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b second master &&\n"> <LIT_CHARS "\tgit show first:a1 |\n"> <LIT_CHARS "\tsed -e \"s/To die, t/To die! T/\" -e \"s/Some title/Some Title/\" >a1 &&\n"> <LIT_CHARS "\techo \"* END *\" >>a1 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -q -a -m second\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "nothing recorded without rerere">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\trm -rf .git/rr-cache &&\n"> <LIT_CHARS "\tgit config rerere.enabled false &&\n"> <LIT_CHARS "\ttest_must_fail git merge first &&\n"> <LIT_CHARS "\t! test -d .git/rr-cache\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "activate rerere, old style (conflicting merge)">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tmkdir .git/rr-cache &&\n"> <LIT_CHARS "\ttest_might_fail git config --unset rerere.enabled &&\n"> <LIT_CHARS "\ttest_must_fail git merge first &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tsha1=$(perl -pe \"s/\t.*//\" .git/MERGE_RR) &&\n"> <LIT_CHARS "\trr=.git/rr-cache/$sha1 &&\n"> <LIT_CHARS "\tgrep \"^=======\\$\" $rr/preimage &&\n"> <LIT_CHARS "\t! test -f $rr/postimage &&\n"> <LIT_CHARS "\t! test -f $rr/thisimage\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rerere.enabled works, too">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\trm -rf .git/rr-cache &&\n"> <LIT_CHARS "\tgit config rerere.enabled true &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\ttest_must_fail git merge first &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tsha1=$(perl -pe \"s/\t.*//\" .git/MERGE_RR) &&\n"> <LIT_CHARS "\trr=.git/rr-cache/$sha1 &&\n"> <LIT_CHARS "\tgrep ^=======$ $rr/preimage\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "set up rr-cache">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\trm -rf .git/rr-cache &&\n"> <LIT_CHARS "\tgit config rerere.enabled true &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\ttest_must_fail git merge first &&\n"> <LIT_CHARS "\tsha1=$(perl -pe \"s/\t.*//\" .git/MERGE_RR) &&\n"> <LIT_CHARS "\trr=.git/rr-cache/$sha1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rr-cache looks sane">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\t# no postimage or thisimage yet\n"> <LIT_CHARS "\t! test -f $rr/postimage &&\n"> <LIT_CHARS "\t! test -f $rr/thisimage &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# preimage has right number of lines\n"> <LIT_CHARS "\tcnt=$(sed -ne \"/^<<<<<<</,/^>>>>>>>/p\" $rr/preimage | wc -l) &&\n"> <LIT_CHARS "\techo $cnt &&\n"> <LIT_CHARS "\ttest $cnt = 13\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rerere diff">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit show first:a1 >a1 &&\n"> <LIT_CHARS "\tcat >expect <<-\\EOF &&\n"> <LIT_CHARS "\t--- a/a1\n"> <LIT_CHARS "\t+++ b/a1\n"> <LIT_CHARS "\t@@ -1,4 +1,4 @@\n"> <LIT_CHARS "\t-Some Title\n"> <LIT_CHARS "\t+Some title\n"> <LIT_CHARS "\t ==========\n"> <LIT_CHARS "\t Whether ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "tis nobler in the mind to suffer\n"> <LIT_CHARS "\t The slings and arrows of outrageous fortune,\n"> <LIT_CHARS "\t@@ -8,21 +8,11 @@\n"> <LIT_CHARS "\t The heart-ache and the thousand natural shocks\n"> <LIT_CHARS "\t That flesh is heir to, ">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "tis a consummation\n"> <LIT_CHARS "\t Devoutly to be wish">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "d.\n"> <LIT_CHARS "\t-<<<<<<<\n"> <LIT_CHARS "\t-Some Title\n"> <LIT_CHARS "\t-==========\n"> <LIT_CHARS "\t-To die! To sleep;\n"> <LIT_CHARS "\t-=======\n"> <LIT_CHARS "\t Some title\n"> <LIT_CHARS "\t ==========\n"> <LIT_CHARS "\t To die, to sleep;\n"> <LIT_CHARS "\t->>>>>>>\n"> <LIT_CHARS "\t To sleep: perchance to dream: ay, there">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s the rub;\n"> <LIT_CHARS "\t For in that sleep of death what dreams may come\n"> <LIT_CHARS "\t When we have shuffled off this mortal coil,\n"> <LIT_CHARS "\t Must give us pause: there">] [\ LIT_ESCAPED_CHAR "\\'"] [SQ <LIT_CHARS "s the respect\n"> <LIT_CHARS "\t That makes calamity of so long life;\n"> <LIT_CHARS "\t-<<<<<<<\n"> <LIT_CHARS "\t-=======\n"> <LIT_CHARS "\t-* END *\n"> <LIT_CHARS "\t->>>>>>>\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\tgit rerere diff >out &&\n"> <LIT_CHARS "\ttest_cmp expect out\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rerere status">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo a1 >expect &&\n"> <LIT_CHARS "\tgit rerere status >out &&\n"> <LIT_CHARS "\ttest_cmp expect out\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "first postimage wins">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit show first:a1 | sed \"s/To die: t/To die! T/\" >expect &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit commit -q -a -m \"prefer first over second\" &&\n"> <LIT_CHARS "\ttest -f $rr/postimage &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\toldmtimepost=$(test-chmtime -v -60 $rr/postimage | cut -f 1) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b third master &&\n"> <LIT_CHARS "\tgit show second^:a1 | sed \"s/To die: t/To die! T/\" >a1 &&\n"> <LIT_CHARS "\tgit commit -q -a -m third &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge first &&\n"> <LIT_CHARS "\t# rerere kicked in\n"> <LIT_CHARS "\t! grep \"^=======\\$\" a1 &&\n"> <LIT_CHARS "\ttest_cmp expect a1\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rerere updates postimage timestamp">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tnewmtimepost=$(test-chmtime -v +0 $rr/postimage | cut -f 1) &&\n"> <LIT_CHARS "\ttest $oldmtimepost -lt $newmtimepost\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rerere clear">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tmv $rr/postimage .git/post-saved &&\n"> <LIT_CHARS "\techo \"$sha1\ta1\" | perl -pe \"y/\\012/\\000/\" >.git/MERGE_RR &&\n"> <LIT_CHARS "\tgit rerere clear &&\n"> <LIT_CHARS "\t! test -d $rr\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "leftover directory">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tmkdir -p $rr &&\n"> <LIT_CHARS "\ttest_must_fail git merge first &&\n"> <LIT_CHARS "\ttest -f $rr/preimage\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "missing preimage">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tmkdir -p $rr &&\n"> <LIT_CHARS "\tcp .git/post-saved $rr/postimage &&\n"> <LIT_CHARS "\ttest_must_fail git merge first &&\n"> <LIT_CHARS "\ttest -f $rr/preimage\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "set up for garbage collection tests">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tmkdir -p $rr &&\n"> <LIT_CHARS "\techo Hello >$rr/preimage &&\n"> <LIT_CHARS "\techo World >$rr/postimage &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tsha2=4000000000000000000000000000000000000000 &&\n"> <LIT_CHARS "\trr2=.git/rr-cache/$sha2 &&\n"> <LIT_CHARS "\tmkdir $rr2 &&\n"> <LIT_CHARS "\techo Hello >$rr2/preimage &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\talmost_15_days_ago=$((60-15*86400)) &&\n"> <LIT_CHARS "\tjust_over_15_days_ago=$((-1-15*86400)) &&\n"> <LIT_CHARS "\talmost_60_days_ago=$((60-60*86400)) &&\n"> <LIT_CHARS "\tjust_over_60_days_ago=$((-1-60*86400)) &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest-chmtime =$just_over_60_days_ago $rr/preimage &&\n"> <LIT_CHARS "\ttest-chmtime =$almost_60_days_ago $rr/postimage &&\n"> <LIT_CHARS "\ttest-chmtime =$almost_15_days_ago $rr2/preimage\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "gc preserves young or recently used records">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit rerere gc &&\n"> <LIT_CHARS "\ttest -f $rr/preimage &&\n"> <LIT_CHARS "\ttest -f $rr2/preimage\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "old records rest in peace">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest-chmtime =$just_over_60_days_ago $rr/postimage &&\n"> <LIT_CHARS "\ttest-chmtime =$just_over_15_days_ago $rr2/preimage &&\n"> <LIT_CHARS "\tgit rerere gc &&\n"> <LIT_CHARS "\t! test -f $rr/preimage &&\n"> <LIT_CHARS "\t! test -f $rr2/preimage\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "setup: file2 added differently in two branches">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout -b fourth &&\n"> <LIT_CHARS "\techo Hallo >file2 &&\n"> <LIT_CHARS "\tgit add file2 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m version1 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout third &&\n"> <LIT_CHARS "\techo Bello >file2 &&\n"> <LIT_CHARS "\tgit add file2 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m version2 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge fourth &&\n"> <LIT_CHARS "\techo Cello >file2 &&\n"> <LIT_CHARS "\tgit add file2 &&\n"> <LIT_CHARS "\tgit commit -m resolution\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "resolution was recorded properly">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\techo Cello >expected &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard HEAD~2 &&\n"> <LIT_CHARS "\tgit checkout -b fifth &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\techo Hallo >file3 &&\n"> <LIT_CHARS "\tgit add file3 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m version1 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit checkout third &&\n"> <LIT_CHARS "\techo Bello >file3 &&\n"> <LIT_CHARS "\tgit add file3 &&\n"> <LIT_CHARS "\ttest_tick &&\n"> <LIT_CHARS "\tgit commit -m version2 &&\n"> <LIT_CHARS "\tgit tag version2 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git merge fifth &&\n"> <LIT_CHARS "\ttest_cmp expected file3 &&\n"> <LIT_CHARS "\ttest_must_fail git update-index --refresh\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS rerere.autoupdate>]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit config rerere.autoupdate true &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout version2 &&\n"> <LIT_CHARS "\ttest_must_fail git merge fifth &&\n"> <LIT_CHARS "\tgit update-index --refresh\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge --rerere-autoupdate">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_might_fail git config --unset rerere.autoupdate &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout version2 &&\n"> <LIT_CHARS "\ttest_must_fail git merge --rerere-autoupdate fifth &&\n"> <LIT_CHARS "\tgit update-index --refresh\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "merge --no-rerere-autoupdate">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\theadblob=$(git rev-parse version2:file3) &&\n"> <LIT_CHARS "\tmergeblob=$(git rev-parse fifth:file3) &&\n"> <LIT_CHARS "\tcat >expected <<-EOF &&\n"> <LIT_CHARS "\t100644 $headblob 2\tfile3\n"> <LIT_CHARS "\t100644 $mergeblob 3\tfile3\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit config rerere.autoupdate true &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout version2 &&\n"> <LIT_CHARS "\ttest_must_fail git merge --no-rerere-autoupdate fifth &&\n"> <LIT_CHARS "\tgit ls-files -u >actual &&\n"> <LIT_CHARS "\ttest_cmp expected actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "set up an unresolved merge">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\theadblob=$(git rev-parse version2:file3) &&\n"> <LIT_CHARS "\tmergeblob=$(git rev-parse fifth:file3) &&\n"> <LIT_CHARS "\tcat >expected.unresolved <<-EOF &&\n"> <LIT_CHARS "\t100644 $headblob 2\tfile3\n"> <LIT_CHARS "\t100644 $mergeblob 3\tfile3\n"> <LIT_CHARS "\tEOF\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_might_fail git config --unset rerere.autoupdate &&\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\tgit checkout version2 &&\n"> <LIT_CHARS "\tfifth=$(git rev-parse fifth) &&\n"> <LIT_CHARS "\techo \"$fifth\t\tbranch ">] [LIT_CHARS fifth] [SQ <LIT_CHARS " of .\" |\n"> <LIT_CHARS "\tgit fmt-merge-msg >msg &&\n"> <LIT_CHARS "\tancestor=$(git merge-base version2 fifth) &&\n"> <LIT_CHARS "\ttest_must_fail git merge-recursive \"$ancestor\" -- HEAD fifth &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit ls-files --stage >failedmerge &&\n"> <LIT_CHARS "\tcp file3 file3.conflict &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit ls-files -u >actual &&\n"> <LIT_CHARS "\ttest_cmp expected.unresolved actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "explicit rerere">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_might_fail git config --unset rerere.autoupdate &&\n"> <LIT_CHARS "\tgit rm -fr --cached . &&\n"> <LIT_CHARS "\tgit update-index --index-info <failedmerge &&\n"> <LIT_CHARS "\tcp file3.conflict file3 &&\n"> <LIT_CHARS "\ttest_must_fail git update-index --refresh -q &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit rerere &&\n"> <LIT_CHARS "\tgit ls-files -u >actual &&\n"> <LIT_CHARS "\ttest_cmp expected.unresolved actual\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "explicit rerere with autoupdate">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit config rerere.autoupdate true &&\n"> <LIT_CHARS "\tgit rm -fr --cached . &&\n"> <LIT_CHARS "\tgit update-index --index-info <failedmerge &&\n"> <LIT_CHARS "\tcp file3.conflict file3 &&\n"> <LIT_CHARS "\ttest_must_fail git update-index --refresh -q &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit rerere &&\n"> <LIT_CHARS "\tgit update-index --refresh\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "explicit rerere --rerere-autoupdate overrides">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit config rerere.autoupdate false &&\n"> <LIT_CHARS "\tgit rm -fr --cached . &&\n"> <LIT_CHARS "\tgit update-index --index-info <failedmerge &&\n"> <LIT_CHARS "\tcp file3.conflict file3 &&\n"> <LIT_CHARS "\tgit rerere &&\n"> <LIT_CHARS "\tgit ls-files -u >actual1 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit rm -fr --cached . &&\n"> <LIT_CHARS "\tgit update-index --index-info <failedmerge &&\n"> <LIT_CHARS "\tcp file3.conflict file3 &&\n"> <LIT_CHARS "\tgit rerere --rerere-autoupdate &&\n"> <LIT_CHARS "\tgit update-index --refresh &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit rm -fr --cached . &&\n"> <LIT_CHARS "\tgit update-index --index-info <failedmerge &&\n"> <LIT_CHARS "\tcp file3.conflict file3 &&\n"> <LIT_CHARS "\tgit rerere --rerere-autoupdate --no-rerere-autoupdate &&\n"> <LIT_CHARS "\tgit ls-files -u >actual2 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit rm -fr --cached . &&\n"> <LIT_CHARS "\tgit update-index --index-info <failedmerge &&\n"> <LIT_CHARS "\tcp file3.conflict file3 &&\n"> <LIT_CHARS "\tgit rerere --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate &&\n"> <LIT_CHARS "\tgit update-index --refresh &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_cmp expected.unresolved actual1 &&\n"> <LIT_CHARS "\ttest_cmp expected.unresolved actual2\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rerere --no-no-rerere-autoupdate">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit rm -fr --cached . &&\n"> <LIT_CHARS "\tgit update-index --index-info <failedmerge &&\n"> <LIT_CHARS "\tcp file3.conflict file3 &&\n"> <LIT_CHARS "\ttest_must_fail git rerere --no-no-rerere-autoupdate 2>err &&\n"> <LIT_CHARS "\ttest_i18ngrep [Uu]sage err &&\n"> <LIT_CHARS "\ttest_must_fail git update-index --refresh\n">]})
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rerere -h">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\ttest_must_fail git rerere -h >help &&\n"> <LIT_CHARS "\ttest_i18ngrep [Uu]sage help\n">]})
  (FunctionDef concat_insert []
    (List
      (= scope=<EAssignScope.GLOBAL 1> flags=0 words=[] bindings=[('last', {[VarSub 1]})])
      (Com {[LIT_CHARS shift]})
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS cat]} {[LIT_CHARS early]})
        (AndOr OP_AND_IF
          (Com {[LIT_CHARS printf]} {[DQ [LIT_CHARS "%s"][\ LIT_ESCAPED_CHAR "\\n"]]} {[DQ [VarSub @]]})
          (Com {[LIT_CHARS cat]} {[LIT_CHARS late]} {[DQ [VarSub last]]})
        )
      )
    )
  )
  (FunctionDef count_pre_post []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS find]} {[LIT_CHARS .git/rr-cache/]} {[LIT_CHARS -type]} {[LIT_CHARS f]} {[LIT_CHARS -name]} {[DQ [LIT_CHARS "preimage*"]]}
        <
        (FilenameRedirectNode filename={[LIT_CHARS actual]} <REDIR_GREAT ">"> 1),
        >
      )
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS test_line_count]} {[LIT_OTHER "="]} {[DQ [VarSub 1]]} {[LIT_CHARS actual]})
        (AndOr OP_AND_IF
          (Com {[LIT_CHARS find]} {[LIT_CHARS .git/rr-cache/]} {[LIT_CHARS -type]} {[LIT_CHARS f]} {[LIT_CHARS -name]} {[DQ [LIT_CHARS "postimage*"]]}
            <
            (FilenameRedirectNode filename={[LIT_CHARS actual]} <REDIR_GREAT ">"> 1),
            >
          )
          (Com {[LIT_CHARS test_line_count]} {[LIT_OTHER "="]} {[DQ [VarSub 2]]} {[LIT_CHARS actual]})
        )
      )
    )
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "rerere gc">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tfind .git/rr-cache -type f >original &&\n"> <LIT_CHARS "\txargs test-chmtime -172800 <original &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&\n"> <LIT_CHARS "\tfind .git/rr-cache -type f >actual &&\n"> <LIT_CHARS "\ttest_cmp original actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit -c gc.rerereresolved=5 -c gc.rerereunresolved=0 rerere gc &&\n"> <LIT_CHARS "\tfind .git/rr-cache -type f >actual &&\n"> <LIT_CHARS "\ttest_cmp original actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit -c gc.rerereresolved=0 -c gc.rerereunresolved=0 rerere gc &&\n"> <LIT_CHARS "\tfind .git/rr-cache -type f >actual &&\n"> <LIT_CHARS "\t>expect &&\n"> <LIT_CHARS "\ttest_cmp expect actual\n">]})
  (FunctionDef merge_conflict_resolve []
    (AndOr OP_AND_IF
      (Com {[LIT_CHARS git]} {[LIT_CHARS reset]} {[LIT_CHARS --hard]})
      (AndOr OP_AND_IF
        (Com {[LIT_CHARS test_must_fail]} {[LIT_CHARS git]} {[LIT_CHARS merge]} {[LIT_CHARS six.1]})
        (AndOr OP_AND_IF
          (Com {[LIT_CHARS concat_insert]} {[LIT_CHARS short]} {[LIT_CHARS 6.1]} {[LIT_CHARS 6.2]}
            <
            (FilenameRedirectNode filename={[LIT_CHARS file1]} <REDIR_GREAT ">"> 1),
            >
          )
          (Com {[LIT_CHARS concat_insert]} {[LIT_CHARS long]} {[LIT_CHARS 6.1]} {[LIT_CHARS 6.2]}
            <
            (FilenameRedirectNode filename={[LIT_CHARS file2]} <REDIR_GREAT ">"> 1),
            >
          )
        )
      )
    )
  )
  (Com {[LIT_CHARS test_expect_success]} {[SQ <LIT_CHARS "multiple identical conflicts">]} {[SQ <LIT_CHARS "\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\ttest_seq 1 6 >early &&\n"> <LIT_CHARS "\t>late &&\n"> <LIT_CHARS "\ttest_seq 11 15 >short &&\n"> <LIT_CHARS "\ttest_seq 111 120 >long &&\n"> <LIT_CHARS "\tconcat_insert short >file1 &&\n"> <LIT_CHARS "\tconcat_insert long >file2 &&\n"> <LIT_CHARS "\tgit add file1 file2 &&\n"> <LIT_CHARS "\tgit commit -m base &&\n"> <LIT_CHARS "\tgit tag base &&\n"> <LIT_CHARS "\tgit checkout -b six.1 &&\n"> <LIT_CHARS "\tconcat_insert short 6.1 >file1 &&\n"> <LIT_CHARS "\tconcat_insert long 6.1 >file2 &&\n"> <LIT_CHARS "\tgit add file1 file2 &&\n"> <LIT_CHARS "\tgit commit -m 6.1 &&\n"> <LIT_CHARS "\tgit checkout -b six.2 HEAD^ &&\n"> <LIT_CHARS "\tconcat_insert short 6.2 >file1 &&\n"> <LIT_CHARS "\tconcat_insert long 6.2 >file2 &&\n"> <LIT_CHARS "\tgit add file1 file2 &&\n"> <LIT_CHARS "\tgit commit -m 6.2 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# At this point, six.1 and six.2\n"> <LIT_CHARS "\t# - derive from common ancestor that has two files\n"> <LIT_CHARS "\t#   1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)\n"> <LIT_CHARS "\t# - six.1 replaces these 7s with 6.1\n"> <LIT_CHARS "\t# - six.2 replaces these 7s with 6.2\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tmerge_conflict_resolve &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Check that rerere knows that file1 and file2 have conflicts\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tprintf \"%s\\n\" file1 file2 >expect &&\n"> <LIT_CHARS "\tgit ls-files -u | sed -e \"s/^.*\t//\" | sort -u >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit rerere status | sort >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tgit rerere remaining >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcount_pre_post 2 0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Pretend that the conflicts were made quite some time ago\n"> <LIT_CHARS "\tfind .git/rr-cache/ -type f | xargs test-chmtime -172800 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Unresolved entries have not expired yet\n"> <LIT_CHARS "\tgit -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&\n"> <LIT_CHARS "\tcount_pre_post 2 0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Unresolved entries have expired\n"> <LIT_CHARS "\tgit -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&\n"> <LIT_CHARS "\tcount_pre_post 0 0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Recreate the conflicted state\n"> <LIT_CHARS "\tmerge_conflict_resolve &&\n"> <LIT_CHARS "\tcount_pre_post 2 0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Clear it\n"> <LIT_CHARS "\tgit rerere clear &&\n"> <LIT_CHARS "\tcount_pre_post 0 0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Recreate the conflicted state\n"> <LIT_CHARS "\tmerge_conflict_resolve &&\n"> <LIT_CHARS "\tcount_pre_post 2 0 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# We resolved file1 and file2\n"> <LIT_CHARS "\tgit rerere &&\n"> <LIT_CHARS "\t>expect &&\n"> <LIT_CHARS "\tgit rerere remaining >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# We must have recorded both of them\n"> <LIT_CHARS "\tcount_pre_post 2 2 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Now we should be able to resolve them both\n"> <LIT_CHARS "\tgit reset --hard &&\n"> <LIT_CHARS "\ttest_must_fail git merge six.1 &&\n"> <LIT_CHARS "\tgit rerere &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t>expect &&\n"> <LIT_CHARS "\tgit rerere remaining >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tconcat_insert short 6.1 6.2 >file1.expect &&\n"> <LIT_CHARS "\tconcat_insert long 6.1 6.2 >file2.expect &&\n"> <LIT_CHARS "\ttest_cmp file1.expect file1 &&\n"> <LIT_CHARS "\ttest_cmp file2.expect file2 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Forget resolution for file2\n"> <LIT_CHARS "\tgit rerere forget file2 &&\n"> <LIT_CHARS "\techo file2 >expect &&\n"> <LIT_CHARS "\tgit rerere status >actual &&\n"> <LIT_CHARS "\ttest_cmp expect actual &&\n"> <LIT_CHARS "\tcount_pre_post 2 1 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# file2 already has correct resolution, so record it again\n"> <LIT_CHARS "\tgit rerere &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Pretend that the resolutions are old again\n"> <LIT_CHARS "\tfind .git/rr-cache/ -type f | xargs test-chmtime -172800 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Resolved entries have not expired yet\n"> <LIT_CHARS "\tgit -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\tcount_pre_post 2 2 &&\n"> <LIT_CHARS "\n"> <LIT_CHARS "\t# Resolved entries have expired\n"> <LIT_CHARS "\tgit -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&\n"> <LIT_CHARS "\tcount_pre_post 0 0\n">]})
  (Com {[LIT_CHARS test_done]})
)