merge-recursive: demonstrate an incorrect conflict with submodule
[git/dscho.git] / t / lib-patch-mode.sh
blobce36f34d0337d29f6ec8f274cd99ad201bd3965d
1 : included from t2016 and others
3 . ./test-lib.sh
5 if ! test_have_prereq PERL; then
6 say 'skipping --patch tests, perl not available'
7 test_done
8 fi
10 set_state () {
11 echo "$3" > "$1" &&
12 git add "$1" &&
13 echo "$2" > "$1"
16 save_state () {
17 noslash="$(echo "$1" | tr / _)" &&
18 cat "$1" > _worktree_"$noslash" &&
19 git show :"$1" > _index_"$noslash"
22 set_and_save_state () {
23 set_state "$@" &&
24 save_state "$1"
27 verify_state () {
28 test "$(cat "$1")" = "$2" &&
29 test "$(git show :"$1")" = "$3"
32 verify_saved_state () {
33 noslash="$(echo "$1" | tr / _)" &&
34 verify_state "$1" "$(cat _worktree_"$noslash")" "$(cat _index_"$noslash")"
37 save_head () {
38 git rev-parse HEAD > _head
41 verify_saved_head () {
42 test "$(cat _head)" = "$(git rev-parse HEAD)"