#!/bin/sh global test_description := ''reset --hard unmerged'' source ./test-lib.sh test_expect_success setup ' mkdir before later && >before/1 && >before/2 && >hello && >later/3 && git add before hello later && git commit -m world && H=$(git rev-parse :hello) && git rm --cached hello && echo "100644 $H 2 hello" | git update-index --index-info && rm -f hello && mkdir -p hello && >hello/world && test "$(git ls-files -o)" = hello/world ' test_expect_success 'reset --hard should restore unmerged ones' ' git reset --hard && git ls-files --error-unmatch before/1 before/2 hello later/3 && test -f hello ' test_expect_success 'reset --hard did not corrupt index or cached-tree' ' T=$(git write-tree) && rm -f .git/index && git add before hello later && U=$(git write-tree) && test "$T" = "$U" ' test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"reset --hard unmerged">)} spids: [4] ) ] spids: [4] ) (C {(.)} {(./test-lib.sh)}) (C {(test_expect_success)} {(setup)} { (SQ <"\n"> <"\n"> <"\tmkdir before later &&\n"> <"\t>before/1 &&\n"> <"\t>before/2 &&\n"> <"\t>hello &&\n"> <"\t>later/3 &&\n"> <"\tgit add before hello later &&\n"> <"\tgit commit -m world &&\n"> <"\n"> <"\tH=$(git rev-parse :hello) &&\n"> <"\tgit rm --cached hello &&\n"> <"\techo \"100644 $H 2\thello\" | git update-index --index-info &&\n"> <"\n"> <"\trm -f hello &&\n"> <"\tmkdir -p hello &&\n"> <"\t>hello/world &&\n"> <"\ttest \"$(git ls-files -o)\" = hello/world\n"> <"\n"> ) } ) (C {(test_expect_success)} {(SQ <"reset --hard should restore unmerged ones">)} { (SQ <"\n"> <"\n"> <"\tgit reset --hard &&\n"> <"\tgit ls-files --error-unmatch before/1 before/2 hello later/3 &&\n"> <"\ttest -f hello\n"> <"\n"> ) } ) (C {(test_expect_success)} {(SQ <"reset --hard did not corrupt index or cached-tree">)} { (SQ <"\n"> <"\n"> <"\tT=$(git write-tree) &&\n"> <"\trm -f .git/index &&\n"> <"\tgit add before hello later &&\n"> <"\tU=$(git write-tree) &&\n"> <"\ttest \"$T\" = \"$U\"\n"> <"\n"> ) } ) (C {(test_done)}) ] )