#!/bin/sh # # Copyright (c) 2009 Stephen Boyd # global test_description := ''git apply --build-fake-ancestor handling.'' source ./test-lib.sh test_expect_success 'setup' ' test_commit 1 && test_commit 2 && mkdir sub && test_commit 3 sub/3.t && test_commit 4 ' test_expect_success 'apply --build-fake-ancestor' ' git checkout 2 && echo "A" > 1.t && git diff > 1.patch && git reset --hard && git checkout 1 && git apply --build-fake-ancestor 1.ancestor 1.patch ' test_expect_success 'apply --build-fake-ancestor in a subdirectory' ' git checkout 3 && echo "C" > sub/3.t && git diff > 3.patch && git reset --hard && git checkout 4 && ( cd sub && git apply --build-fake-ancestor 3.ancestor ../3.patch && test -f 3.ancestor ) && git apply --build-fake-ancestor 3.ancestor 3.patch && test_cmp sub/3.ancestor 3.ancestor ' test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"git apply --build-fake-ancestor handling.">)} spids: [13] ) ] spids: [13] ) (C {(.)} {(./test-lib.sh)}) (C {(test_expect_success)} {(SQ )} { (SQ <"\n"> <"\ttest_commit 1 &&\n"> <"\ttest_commit 2 &&\n"> <"\tmkdir sub &&\n"> <"\ttest_commit 3 sub/3.t &&\n"> <"\ttest_commit 4\n"> ) } ) (C {(test_expect_success)} {(SQ <"apply --build-fake-ancestor">)} { (SQ <"\n"> <"\tgit checkout 2 &&\n"> <"\techo \"A\" > 1.t &&\n"> <"\tgit diff > 1.patch &&\n"> <"\tgit reset --hard &&\n"> <"\tgit checkout 1 &&\n"> <"\tgit apply --build-fake-ancestor 1.ancestor 1.patch\n"> ) } ) (C {(test_expect_success)} {(SQ <"apply --build-fake-ancestor in a subdirectory">)} { (SQ <"\n"> <"\tgit checkout 3 &&\n"> <"\techo \"C\" > sub/3.t &&\n"> <"\tgit diff > 3.patch &&\n"> <"\tgit reset --hard &&\n"> <"\tgit checkout 4 &&\n"> <"\t(\n"> <"\t\tcd sub &&\n"> <"\t\tgit apply --build-fake-ancestor 3.ancestor ../3.patch &&\n"> <"\t\ttest -f 3.ancestor\n"> <"\t) &&\n"> <"\tgit apply --build-fake-ancestor 3.ancestor 3.patch &&\n"> <"\ttest_cmp sub/3.ancestor 3.ancestor\n"> ) } ) (C {(test_done)}) ] )