#!/bin/sh # # Copyright (c) 2005 Junio C Hamano # global test_description := ''git apply handling binary patches '' source ./test-lib.sh test_expect_success 'setup' ' cat >file1 <<-\EOF && A quick brown fox jumps over the lazy dog. A tiny little penguin runs around in circles. There is a flag with Linux written on it. A slow black-and-white panda just sits there, munching on his bamboo. EOF cat file1 >file2 && cat file1 >file4 && git update-index --add --remove file1 file2 file4 && git commit -m "Initial Version" 2>/dev/null && git checkout -b binary && perl -pe "y/x/\000/" file3 && cat file3 >file4 && git add file2 && perl -pe "y/\000/v/" file1 && rm -f file2 && git update-index --add --remove file1 file2 file3 file4 && git commit -m "Second Version" && git diff-tree -p master binary >B.diff && git diff-tree -p -C master binary >C.diff && git diff-tree -p --binary master binary >BF.diff && git diff-tree -p --binary -C master binary >CF.diff && git diff-tree -p --full-index master binary >B-index.diff && git diff-tree -p -C --full-index master binary >C-index.diff && git diff-tree -p --binary --no-prefix master binary -- file3 >B0.diff && git init other-repo && ( cd other-repo && git fetch .. master && git reset --hard FETCH_HEAD ) ' test_expect_success 'stat binary diff -- should not fail.' \ 'git checkout master && git apply --stat --summary B.diff' test_expect_success 'stat binary -p0 diff -- should not fail.' ' git checkout master && git apply --stat -p0 B0.diff ' test_expect_success 'stat binary diff (copy) -- should not fail.' \ 'git checkout master && git apply --stat --summary C.diff' test_expect_success 'check binary diff -- should fail.' \ 'git checkout master && test_must_fail git apply --check B.diff' test_expect_success 'check binary diff (copy) -- should fail.' \ 'git checkout master && test_must_fail git apply --check C.diff' test_expect_success \ 'check incomplete binary diff with replacement -- should fail.' ' git checkout master && test_must_fail git apply --check --allow-binary-replacement B.diff ' test_expect_success \ 'check incomplete binary diff with replacement (copy) -- should fail.' ' git checkout master && test_must_fail git apply --check --allow-binary-replacement C.diff ' test_expect_success 'check binary diff with replacement.' \ 'git checkout master && git apply --check --allow-binary-replacement BF.diff' test_expect_success 'check binary diff with replacement (copy).' \ 'git checkout master && git apply --check --allow-binary-replacement CF.diff' # Now we start applying them. proc do_reset { rm -f file? && git reset --hard && git checkout -f master } test_expect_success 'apply binary diff -- should fail.' \ 'do_reset && test_must_fail git apply B.diff' test_expect_success 'apply binary diff -- should fail.' \ 'do_reset && test_must_fail git apply --index B.diff' test_expect_success 'apply binary diff (copy) -- should fail.' \ 'do_reset && test_must_fail git apply C.diff' test_expect_success 'apply binary diff (copy) -- should fail.' \ 'do_reset && test_must_fail git apply --index C.diff' test_expect_success 'apply binary diff with full-index' ' do_reset && git apply B-index.diff ' test_expect_success 'apply binary diff with full-index (copy)' ' do_reset && git apply C-index.diff ' test_expect_success 'apply full-index binary diff in new repo' ' (cd other-repo && do_reset && test_must_fail git apply ../B-index.diff) ' test_expect_success 'apply binary diff without replacement.' \ 'do_reset && git apply BF.diff' test_expect_success 'apply binary diff without replacement (copy).' \ 'do_reset && git apply CF.diff' test_expect_success 'apply binary diff.' \ 'do_reset && git apply --allow-binary-replacement --index BF.diff && test -z "$(git diff --name-status binary)"' test_expect_success 'apply binary diff (copy).' \ 'do_reset && git apply --allow-binary-replacement --index CF.diff && test -z "$(git diff --name-status binary)"' test_expect_success 'apply binary -p0 diff' ' do_reset && git apply -p0 --index B0.diff && test -z "$(git diff --name-status binary -- file3)" ' test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"git apply handling binary patches\n"> <"\n">)} spids: [13] ) ] spids: [13] ) (C {(.)} {(./test-lib.sh)}) (C {(test_expect_success)} {(SQ )} { (SQ <"\n"> <"\tcat >file1 <<-\\EOF &&\n"> <"\tA quick brown fox jumps over the lazy dog.\n"> <"\tA tiny little penguin runs around in circles.\n"> <"\tThere is a flag with Linux written on it.\n"> <"\tA slow black-and-white panda just sits there,\n"> <"\tmunching on his bamboo.\n"> <"\tEOF\n"> <"\tcat file1 >file2 &&\n"> <"\tcat file1 >file4 &&\n"> <"\n"> <"\tgit update-index --add --remove file1 file2 file4 &&\n"> <"\tgit commit -m \"Initial Version\" 2>/dev/null &&\n"> <"\n"> <"\tgit checkout -b binary &&\n"> <"\tperl -pe \"y/x/\\000/\" file3 &&\n"> <"\tcat file3 >file4 &&\n"> <"\tgit add file2 &&\n"> <"\tperl -pe \"y/\\000/v/\" file1 &&\n"> <"\trm -f file2 &&\n"> <"\tgit update-index --add --remove file1 file2 file3 file4 &&\n"> <"\tgit commit -m \"Second Version\" &&\n"> <"\n"> <"\tgit diff-tree -p master binary >B.diff &&\n"> <"\tgit diff-tree -p -C master binary >C.diff &&\n"> <"\n"> <"\tgit diff-tree -p --binary master binary >BF.diff &&\n"> <"\tgit diff-tree -p --binary -C master binary >CF.diff &&\n"> <"\n"> <"\tgit diff-tree -p --full-index master binary >B-index.diff &&\n"> <"\tgit diff-tree -p -C --full-index master binary >C-index.diff &&\n"> <"\n"> <"\tgit diff-tree -p --binary --no-prefix master binary -- file3 >B0.diff &&\n"> <"\n"> <"\tgit init other-repo &&\n"> <"\t(\n"> <"\t\tcd other-repo &&\n"> <"\t\tgit fetch .. master &&\n"> <"\t\tgit reset --hard FETCH_HEAD\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"stat binary diff -- should not fail.">)} {(SQ <"git checkout master &&\n"> <"\t git apply --stat --summary B.diff">)} ) (C {(test_expect_success)} {(SQ <"stat binary -p0 diff -- should not fail.">)} {(SQ <"\n"> <"\t git checkout master &&\n"> <"\t git apply --stat -p0 B0.diff\n">)} ) (C {(test_expect_success)} {(SQ <"stat binary diff (copy) -- should not fail.">)} {(SQ <"git checkout master &&\n"> <"\t git apply --stat --summary C.diff">)} ) (C {(test_expect_success)} {(SQ <"check binary diff -- should fail.">)} {(SQ <"git checkout master &&\n"> <"\t test_must_fail git apply --check B.diff">)} ) (C {(test_expect_success)} {(SQ <"check binary diff (copy) -- should fail.">)} {(SQ <"git checkout master &&\n"> <"\t test_must_fail git apply --check C.diff">)} ) (C {(test_expect_success)} {(SQ <"check incomplete binary diff with replacement -- should fail.">)} { (SQ <"\n"> <"\tgit checkout master &&\n"> <"\ttest_must_fail git apply --check --allow-binary-replacement B.diff\n"> ) } ) (C {(test_expect_success)} {(SQ <"check incomplete binary diff with replacement (copy) -- should fail.">)} { (SQ <"\n"> <"\t git checkout master &&\n"> <"\t test_must_fail git apply --check --allow-binary-replacement C.diff\n"> ) } ) (C {(test_expect_success)} {(SQ <"check binary diff with replacement.">)} {(SQ <"git checkout master &&\n"> <"\t git apply --check --allow-binary-replacement BF.diff">)} ) (C {(test_expect_success)} {(SQ <"check binary diff with replacement (copy).">)} {(SQ <"git checkout master &&\n"> <"\t git apply --check --allow-binary-replacement CF.diff">)} ) (FuncDef name: do_reset body: (BraceGroup children: [ (AndOr children: [ (C {(rm)} {(-f)} {(file) (Lit_Other "?")}) (AndOr children: [(C {(git)} {(reset)} {(--hard)}) (C {(git)} {(checkout)} {(-f)} {(master)})] op_id: Op_DAmp ) ] op_id: Op_DAmp ) ] spids: [210] ) spids: [205 209] ) (C {(test_expect_success)} {(SQ <"apply binary diff -- should fail.">)} {(SQ <"do_reset &&\n"> <"\t test_must_fail git apply B.diff">)} ) (C {(test_expect_success)} {(SQ <"apply binary diff -- should fail.">)} {(SQ <"do_reset &&\n"> <"\t test_must_fail git apply --index B.diff">)} ) (C {(test_expect_success)} {(SQ <"apply binary diff (copy) -- should fail.">)} {(SQ <"do_reset &&\n"> <"\t test_must_fail git apply C.diff">)} ) (C {(test_expect_success)} {(SQ <"apply binary diff (copy) -- should fail.">)} {(SQ <"do_reset &&\n"> <"\t test_must_fail git apply --index C.diff">)} ) (C {(test_expect_success)} {(SQ <"apply binary diff with full-index">)} {(SQ <"\n"> <"\tdo_reset &&\n"> <"\tgit apply B-index.diff\n">)} ) (C {(test_expect_success)} {(SQ <"apply binary diff with full-index (copy)">)} {(SQ <"\n"> <"\tdo_reset &&\n"> <"\tgit apply C-index.diff\n">)} ) (C {(test_expect_success)} {(SQ <"apply full-index binary diff in new repo">)} { (SQ <"\n"> <"\t(cd other-repo &&\n"> <"\t do_reset &&\n"> <"\t test_must_fail git apply ../B-index.diff)\n"> ) } ) (C {(test_expect_success)} {(SQ <"apply binary diff without replacement.">)} {(SQ <"do_reset &&\n"> <"\t git apply BF.diff">)} ) (C {(test_expect_success)} {(SQ <"apply binary diff without replacement (copy).">)} {(SQ <"do_reset &&\n"> <"\t git apply CF.diff">)} ) (C {(test_expect_success)} {(SQ <"apply binary diff.">)} { (SQ <"do_reset &&\n"> <"\t git apply --allow-binary-replacement --index BF.diff &&\n"> <"\t test -z \"$(git diff --name-status binary)\""> ) } ) (C {(test_expect_success)} {(SQ <"apply binary diff (copy).">)} { (SQ <"do_reset &&\n"> <"\t git apply --allow-binary-replacement --index CF.diff &&\n"> <"\t test -z \"$(git diff --name-status binary)\""> ) } ) (C {(test_expect_success)} {(SQ <"apply binary -p0 diff">)} { (SQ <"\n"> <"\tdo_reset &&\n"> <"\tgit apply -p0 --index B0.diff &&\n"> <"\ttest -z \"$(git diff --name-status binary -- file3)\"\n"> ) } ) (C {(test_done)}) ] )