#!/bin/sh global test_description := ''unpack-objects'' source ./test-lib.sh test_expect_success setup ' mkdir pub.git && GIT_DIR=pub.git git init --bare && GIT_DIR=pub.git git config receive.fsckobjects true && mkdir work && ( cd work && git init && git config push.default matching && mkdir -p gar/bage && ( cd gar/bage && git init && git config push.default matching && >junk && git add junk && git commit -m "Initial junk" ) && git add gar/bage && git commit -m "Initial superproject" ) ' test_expect_success push ' ( cd work && git push ../pub.git master ) ' test_expect_success 'push if submodule has no remote' ' ( cd work/gar/bage && >junk2 && git add junk2 && git commit -m "Second junk" ) && ( cd work && git add gar/bage && git commit -m "Second commit for gar/bage" && git push --recurse-submodules=check ../pub.git master ) ' test_expect_success 'push fails if submodule commit not on remote' ' ( cd work/gar && git clone --bare bage ../../submodule.git && cd bage && git remote add origin ../../../submodule.git && git fetch && >junk3 && git add junk3 && git commit -m "Third junk" ) && ( cd work && git add gar/bage && git commit -m "Third commit for gar/bage" && # the push should fail with --recurse-submodules=check # on the command line... test_must_fail git push --recurse-submodules=check ../pub.git master && # ...or if specified in the configuration.. test_must_fail git -c push.recurseSubmodules=check push ../pub.git master ) ' test_expect_success 'push succeeds after commit was pushed to remote' ' ( cd work/gar/bage && git push origin master ) && ( cd work && git push --recurse-submodules=check ../pub.git master ) ' test_expect_success 'push succeeds if submodule commit not on remote but using on-demand on command line' ' ( cd work/gar/bage && >recurse-on-demand-on-command-line && git add recurse-on-demand-on-command-line && git commit -m "Recurse on-demand on command line junk" ) && ( cd work && git add gar/bage && git commit -m "Recurse on-demand on command line for gar/bage" && git push --recurse-submodules=on-demand ../pub.git master && # Check that the supermodule commit got there git fetch ../pub.git && git diff --quiet FETCH_HEAD master && # Check that the submodule commit got there too cd gar/bage && git diff --quiet origin/master master ) ' test_expect_success 'push succeeds if submodule commit not on remote but using on-demand from config' ' ( cd work/gar/bage && >recurse-on-demand-from-config && git add recurse-on-demand-from-config && git commit -m "Recurse on-demand from config junk" ) && ( cd work && git add gar/bage && git commit -m "Recurse on-demand from config for gar/bage" && git -c push.recurseSubmodules=on-demand push ../pub.git master && # Check that the supermodule commit got there git fetch ../pub.git && git diff --quiet FETCH_HEAD master && # Check that the submodule commit got there too cd gar/bage && git diff --quiet origin/master master ) ' test_expect_success 'push recurse-submodules on command line overrides config' ' ( cd work/gar/bage && >recurse-check-on-command-line-overriding-config && git add recurse-check-on-command-line-overriding-config && git commit -m "Recurse on command-line overriding config junk" ) && ( cd work && git add gar/bage && git commit -m "Recurse on command-line overriding config for gar/bage" && # Ensure that we can override on-demand in the config # to just check submodules test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git master && # Check that the supermodule commit did not get there git fetch ../pub.git && git diff --quiet FETCH_HEAD master^ && # Check that the submodule commit did not get there (cd gar/bage && git diff --quiet origin/master master^) && # Ensure that we can override check in the config to # disable submodule recursion entirely (cd gar/bage && git diff --quiet origin/master master^) && git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git master && git fetch ../pub.git && git diff --quiet FETCH_HEAD master && (cd gar/bage && git diff --quiet origin/master master^) && # Ensure that we can override check in the config to # disable submodule recursion entirely (alternative form) git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git master && git fetch ../pub.git && git diff --quiet FETCH_HEAD master && (cd gar/bage && git diff --quiet origin/master master^) && # Ensure that we can override check in the config to # push the submodule too git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master && git fetch ../pub.git && git diff --quiet FETCH_HEAD master && (cd gar/bage && git diff --quiet origin/master master) ) ' test_expect_success 'push recurse-submodules last one wins on command line' ' ( cd work/gar/bage && >recurse-check-on-command-line-overriding-earlier-command-line && git add recurse-check-on-command-line-overriding-earlier-command-line && git commit -m "Recurse on command-line overridiing earlier command-line junk" ) && ( cd work && git add gar/bage && git commit -m "Recurse on command-line overriding earlier command-line for gar/bage" && # should result in "check" test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git master && # Check that the supermodule commit did not get there git fetch ../pub.git && git diff --quiet FETCH_HEAD master^ && # Check that the submodule commit did not get there (cd gar/bage && git diff --quiet origin/master master^) && # should result in "no" git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git master && # Check that the supermodule commit did get there git fetch ../pub.git && git diff --quiet FETCH_HEAD master && # Check that the submodule commit did not get there (cd gar/bage && git diff --quiet origin/master master^) && # should result in "no" git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git master && # Check that the submodule commit did not get there (cd gar/bage && git diff --quiet origin/master master^) && # But the options in the other order should push the submodule git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git master && # Check that the submodule commit did get there git fetch ../pub.git && (cd gar/bage && git diff --quiet origin/master master) ) ' test_expect_success 'push succeeds if submodule commit not on remote using on-demand from cmdline overriding config' ' ( cd work/gar/bage && >recurse-on-demand-on-command-line-overriding-config && git add recurse-on-demand-on-command-line-overriding-config && git commit -m "Recurse on-demand on command-line overriding config junk" ) && ( cd work && git add gar/bage && git commit -m "Recurse on-demand on command-line overriding config for gar/bage" && git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master && # Check that the supermodule commit got there git fetch ../pub.git && git diff --quiet FETCH_HEAD master && # Check that the submodule commit got there cd gar/bage && git diff --quiet origin/master master ) ' test_expect_success 'push succeeds if submodule commit disabling recursion from cmdline overriding config' ' ( cd work/gar/bage && >recurse-disable-on-command-line-overriding-config && git add recurse-disable-on-command-line-overriding-config && git commit -m "Recurse disable on command-line overriding config junk" ) && ( cd work && git add gar/bage && git commit -m "Recurse disable on command-line overriding config for gar/bage" && git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git master && # Check that the supermodule commit got there git fetch ../pub.git && git diff --quiet FETCH_HEAD master && # But that the submodule commit did not ( cd gar/bage && git diff --quiet origin/master master^ ) && # Now push it to avoid confusing future tests git push --recurse-submodules=on-demand ../pub.git master ) ' test_expect_success 'push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config' ' ( cd work/gar/bage && >recurse-disable-on-command-line-alt-overriding-config && git add recurse-disable-on-command-line-alt-overriding-config && git commit -m "Recurse disable on command-line alternative overriding config junk" ) && ( cd work && git add gar/bage && git commit -m "Recurse disable on command-line alternative overriding config for gar/bage" && git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git master && # Check that the supermodule commit got there git fetch ../pub.git && git diff --quiet FETCH_HEAD master && # But that the submodule commit did not ( cd gar/bage && git diff --quiet origin/master master^ ) && # Now push it to avoid confusing future tests git push --recurse-submodules=on-demand ../pub.git master ) ' test_expect_success 'push fails if recurse submodules option passed as yes' ' ( cd work/gar/bage && >recurse-push-fails-if-recurse-submodules-passed-as-yes && git add recurse-push-fails-if-recurse-submodules-passed-as-yes && git commit -m "Recurse push fails if recurse submodules option passed as yes" ) && ( cd work && git add gar/bage && git commit -m "Recurse push fails if recurse submodules option passed as yes for gar/bage" && test_must_fail git push --recurse-submodules=yes ../pub.git master && test_must_fail git -c push.recurseSubmodules=yes push ../pub.git master && git push --recurse-submodules=on-demand ../pub.git master ) ' test_expect_success 'push fails when commit on multiple branches if one branch has no remote' ' ( cd work/gar/bage && >junk4 && git add junk4 && git commit -m "Fourth junk" ) && ( cd work && git branch branch2 && git add gar/bage && git commit -m "Fourth commit for gar/bage" && git checkout branch2 && ( cd gar/bage && git checkout HEAD~1 ) && >junk1 && git add junk1 && git commit -m "First junk" && test_must_fail git push --recurse-submodules=check ../pub.git ) ' test_expect_success 'push succeeds if submodule has no remote and is on the first superproject commit' ' git init --bare a && git clone a a1 && ( cd a1 && git init b ( cd b && >junk && git add junk && git commit -m "initial" ) && git add b && git commit -m "added submodule" && git push --recurse-submodule=check origin master ) ' test_expect_success 'push unpushed submodules when not needed' ' ( cd work && ( cd gar/bage && git checkout master && >junk5 && git add junk5 && git commit -m "Fifth junk" && git push && git rev-parse origin/master >../../../expected ) && git checkout master && git add gar/bage && git commit -m "Fifth commit for gar/bage" && git push --recurse-submodules=on-demand ../pub.git master ) && ( cd submodule.git && git rev-parse master >../actual ) && test_cmp expected actual ' test_expect_success 'push unpushed submodules when not needed 2' ' ( cd submodule.git && git rev-parse master >../expected ) && ( cd work && ( cd gar/bage && >junk6 && git add junk6 && git commit -m "Sixth junk" ) && >junk2 && git add junk2 && git commit -m "Second junk for work" && git push --recurse-submodules=on-demand ../pub.git master ) && ( cd submodule.git && git rev-parse master >../actual ) && test_cmp expected actual ' test_expect_success 'push unpushed submodules recursively' ' ( cd work && ( cd gar/bage && git checkout master && > junk7 && git add junk7 && git commit -m "Seventh junk" && git rev-parse master >../../../expected ) && git checkout master && git add gar/bage && git commit -m "Seventh commit for gar/bage" && git push --recurse-submodules=on-demand ../pub.git master ) && ( cd submodule.git && git rev-parse master >../actual ) && test_cmp expected actual ' test_expect_success 'push unpushable submodule recursively fails' ' ( cd work && ( cd gar/bage && git rev-parse origin/master >../../../expected && git checkout master~0 && > junk8 && git add junk8 && git commit -m "Eighth junk" ) && git add gar/bage && git commit -m "Eighth commit for gar/bage" && test_must_fail git push --recurse-submodules=on-demand ../pub.git master ) && ( cd submodule.git && git rev-parse master >../actual ) && test_cmp expected actual ' test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ )} spids: [4] ) ] spids: [4] ) (C {(.)} {(./test-lib.sh)}) (C {(test_expect_success)} {(setup)} { (SQ <"\n"> <"\tmkdir pub.git &&\n"> <"\tGIT_DIR=pub.git git init --bare &&\n"> <"\tGIT_DIR=pub.git git config receive.fsckobjects true &&\n"> <"\tmkdir work &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit init &&\n"> <"\t\tgit config push.default matching &&\n"> <"\t\tmkdir -p gar/bage &&\n"> <"\t\t(\n"> <"\t\t\tcd gar/bage &&\n"> <"\t\t\tgit init &&\n"> <"\t\t\tgit config push.default matching &&\n"> <"\t\t\t>junk &&\n"> <"\t\t\tgit add junk &&\n"> <"\t\t\tgit commit -m \"Initial junk\"\n"> <"\t\t) &&\n"> <"\t\tgit add gar/bage &&\n"> <"\t\tgit commit -m \"Initial superproject\"\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(push)} {(SQ <"\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit push ../pub.git master\n"> <"\t)\n">)} ) (C {(test_expect_success)} {(SQ <"push if submodule has no remote">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/gar/bage &&\n"> <"\t\t>junk2 &&\n"> <"\t\tgit add junk2 &&\n"> <"\t\tgit commit -m \"Second junk\"\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit add gar/bage &&\n"> <"\t\tgit commit -m \"Second commit for gar/bage\" &&\n"> <"\t\tgit push --recurse-submodules=check ../pub.git master\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"push fails if submodule commit not on remote">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/gar &&\n"> <"\t\tgit clone --bare bage ../../submodule.git &&\n"> <"\t\tcd bage &&\n"> <"\t\tgit remote add origin ../../../submodule.git &&\n"> <"\t\tgit fetch &&\n"> <"\t\t>junk3 &&\n"> <"\t\tgit add junk3 &&\n"> <"\t\tgit commit -m \"Third junk\"\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit add gar/bage &&\n"> <"\t\tgit commit -m \"Third commit for gar/bage\" &&\n"> <"\t\t# the push should fail with --recurse-submodules=check\n"> <"\t\t# on the command line...\n"> <"\t\ttest_must_fail git push --recurse-submodules=check ../pub.git master &&\n"> <"\n"> <"\t\t# ...or if specified in the configuration..\n"> <"\t\ttest_must_fail git -c push.recurseSubmodules=check push ../pub.git master\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"push succeeds after commit was pushed to remote">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/gar/bage &&\n"> <"\t\tgit push origin master\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit push --recurse-submodules=check ../pub.git master\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"push succeeds if submodule commit not on remote but using on-demand on command line">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/gar/bage &&\n"> <"\t\t>recurse-on-demand-on-command-line &&\n"> <"\t\tgit add recurse-on-demand-on-command-line &&\n"> <"\t\tgit commit -m \"Recurse on-demand on command line junk\"\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit add gar/bage &&\n"> <"\t\tgit commit -m \"Recurse on-demand on command line for gar/bage\" &&\n"> <"\t\tgit push --recurse-submodules=on-demand ../pub.git master &&\n"> <"\t\t# Check that the supermodule commit got there\n"> <"\t\tgit fetch ../pub.git &&\n"> <"\t\tgit diff --quiet FETCH_HEAD master &&\n"> <"\t\t# Check that the submodule commit got there too\n"> <"\t\tcd gar/bage &&\n"> <"\t\tgit diff --quiet origin/master master\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"push succeeds if submodule commit not on remote but using on-demand from config">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/gar/bage &&\n"> <"\t\t>recurse-on-demand-from-config &&\n"> <"\t\tgit add recurse-on-demand-from-config &&\n"> <"\t\tgit commit -m \"Recurse on-demand from config junk\"\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit add gar/bage &&\n"> <"\t\tgit commit -m \"Recurse on-demand from config for gar/bage\" &&\n"> <"\t\tgit -c push.recurseSubmodules=on-demand push ../pub.git master &&\n"> <"\t\t# Check that the supermodule commit got there\n"> <"\t\tgit fetch ../pub.git &&\n"> <"\t\tgit diff --quiet FETCH_HEAD master &&\n"> <"\t\t# Check that the submodule commit got there too\n"> <"\t\tcd gar/bage &&\n"> <"\t\tgit diff --quiet origin/master master\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"push recurse-submodules on command line overrides config">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/gar/bage &&\n"> <"\t\t>recurse-check-on-command-line-overriding-config &&\n"> <"\t\tgit add recurse-check-on-command-line-overriding-config &&\n"> <"\t\tgit commit -m \"Recurse on command-line overriding config junk\"\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit add gar/bage &&\n"> <"\t\tgit commit -m \"Recurse on command-line overriding config for gar/bage\" &&\n"> <"\n"> <"\t\t# Ensure that we can override on-demand in the config\n"> <"\t\t# to just check submodules\n"> < "\t\ttest_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git master &&\n" > <"\t\t# Check that the supermodule commit did not get there\n"> <"\t\tgit fetch ../pub.git &&\n"> <"\t\tgit diff --quiet FETCH_HEAD master^ &&\n"> <"\t\t# Check that the submodule commit did not get there\n"> <"\t\t(cd gar/bage && git diff --quiet origin/master master^) &&\n"> <"\n"> <"\t\t# Ensure that we can override check in the config to\n"> <"\t\t# disable submodule recursion entirely\n"> <"\t\t(cd gar/bage && git diff --quiet origin/master master^) &&\n"> < "\t\tgit -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git master &&\n" > <"\t\tgit fetch ../pub.git &&\n"> <"\t\tgit diff --quiet FETCH_HEAD master &&\n"> <"\t\t(cd gar/bage && git diff --quiet origin/master master^) &&\n"> <"\n"> <"\t\t# Ensure that we can override check in the config to\n"> <"\t\t# disable submodule recursion entirely (alternative form)\n"> <"\t\tgit -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git master &&\n"> <"\t\tgit fetch ../pub.git &&\n"> <"\t\tgit diff --quiet FETCH_HEAD master &&\n"> <"\t\t(cd gar/bage && git diff --quiet origin/master master^) &&\n"> <"\n"> <"\t\t# Ensure that we can override check in the config to\n"> <"\t\t# push the submodule too\n"> < "\t\tgit -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master &&\n" > <"\t\tgit fetch ../pub.git &&\n"> <"\t\tgit diff --quiet FETCH_HEAD master &&\n"> <"\t\t(cd gar/bage && git diff --quiet origin/master master)\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"push recurse-submodules last one wins on command line">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/gar/bage &&\n"> <"\t\t>recurse-check-on-command-line-overriding-earlier-command-line &&\n"> <"\t\tgit add recurse-check-on-command-line-overriding-earlier-command-line &&\n"> <"\t\tgit commit -m \"Recurse on command-line overridiing earlier command-line junk\"\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit add gar/bage &&\n"> < "\t\tgit commit -m \"Recurse on command-line overriding earlier command-line for gar/bage\" &&\n" > <"\n"> <"\t\t# should result in \"check\"\n"> < "\t\ttest_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git master &&\n" > <"\t\t# Check that the supermodule commit did not get there\n"> <"\t\tgit fetch ../pub.git &&\n"> <"\t\tgit diff --quiet FETCH_HEAD master^ &&\n"> <"\t\t# Check that the submodule commit did not get there\n"> <"\t\t(cd gar/bage && git diff --quiet origin/master master^) &&\n"> <"\n"> <"\t\t# should result in \"no\"\n"> < "\t\tgit push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git master &&\n" > <"\t\t# Check that the supermodule commit did get there\n"> <"\t\tgit fetch ../pub.git &&\n"> <"\t\tgit diff --quiet FETCH_HEAD master &&\n"> <"\t\t# Check that the submodule commit did not get there\n"> <"\t\t(cd gar/bage && git diff --quiet origin/master master^) &&\n"> <"\n"> <"\t\t# should result in \"no\"\n"> < "\t\tgit push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git master &&\n" > <"\t\t# Check that the submodule commit did not get there\n"> <"\t\t(cd gar/bage && git diff --quiet origin/master master^) &&\n"> <"\n"> <"\t\t# But the options in the other order should push the submodule\n"> < "\t\tgit push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git master &&\n" > <"\t\t# Check that the submodule commit did get there\n"> <"\t\tgit fetch ../pub.git &&\n"> <"\t\t(cd gar/bage && git diff --quiet origin/master master)\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} { (SQ < "push succeeds if submodule commit not on remote using on-demand from cmdline overriding config" > ) } { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/gar/bage &&\n"> <"\t\t>recurse-on-demand-on-command-line-overriding-config &&\n"> <"\t\tgit add recurse-on-demand-on-command-line-overriding-config &&\n"> <"\t\tgit commit -m \"Recurse on-demand on command-line overriding config junk\"\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit add gar/bage &&\n"> < "\t\tgit commit -m \"Recurse on-demand on command-line overriding config for gar/bage\" &&\n" > < "\t\tgit -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master &&\n" > <"\t\t# Check that the supermodule commit got there\n"> <"\t\tgit fetch ../pub.git &&\n"> <"\t\tgit diff --quiet FETCH_HEAD master &&\n"> <"\t\t# Check that the submodule commit got there\n"> <"\t\tcd gar/bage &&\n"> <"\t\tgit diff --quiet origin/master master\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"push succeeds if submodule commit disabling recursion from cmdline overriding config">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/gar/bage &&\n"> <"\t\t>recurse-disable-on-command-line-overriding-config &&\n"> <"\t\tgit add recurse-disable-on-command-line-overriding-config &&\n"> <"\t\tgit commit -m \"Recurse disable on command-line overriding config junk\"\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit add gar/bage &&\n"> < "\t\tgit commit -m \"Recurse disable on command-line overriding config for gar/bage\" &&\n" > <"\t\tgit -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git master &&\n"> <"\t\t# Check that the supermodule commit got there\n"> <"\t\tgit fetch ../pub.git &&\n"> <"\t\tgit diff --quiet FETCH_HEAD master &&\n"> <"\t\t# But that the submodule commit did not\n"> <"\t\t( cd gar/bage && git diff --quiet origin/master master^ ) &&\n"> <"\t\t# Now push it to avoid confusing future tests\n"> <"\t\tgit push --recurse-submodules=on-demand ../pub.git master\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} { (SQ < "push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config" > ) } { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/gar/bage &&\n"> <"\t\t>recurse-disable-on-command-line-alt-overriding-config &&\n"> <"\t\tgit add recurse-disable-on-command-line-alt-overriding-config &&\n"> < "\t\tgit commit -m \"Recurse disable on command-line alternative overriding config junk\"\n" > <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit add gar/bage &&\n"> < "\t\tgit commit -m \"Recurse disable on command-line alternative overriding config for gar/bage\" &&\n" > <"\t\tgit -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git master &&\n"> <"\t\t# Check that the supermodule commit got there\n"> <"\t\tgit fetch ../pub.git &&\n"> <"\t\tgit diff --quiet FETCH_HEAD master &&\n"> <"\t\t# But that the submodule commit did not\n"> <"\t\t( cd gar/bage && git diff --quiet origin/master master^ ) &&\n"> <"\t\t# Now push it to avoid confusing future tests\n"> <"\t\tgit push --recurse-submodules=on-demand ../pub.git master\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"push fails if recurse submodules option passed as yes">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/gar/bage &&\n"> <"\t\t>recurse-push-fails-if-recurse-submodules-passed-as-yes &&\n"> <"\t\tgit add recurse-push-fails-if-recurse-submodules-passed-as-yes &&\n"> <"\t\tgit commit -m \"Recurse push fails if recurse submodules option passed as yes\"\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit add gar/bage &&\n"> < "\t\tgit commit -m \"Recurse push fails if recurse submodules option passed as yes for gar/bage\" &&\n" > <"\t\ttest_must_fail git push --recurse-submodules=yes ../pub.git master &&\n"> <"\t\ttest_must_fail git -c push.recurseSubmodules=yes push ../pub.git master &&\n"> <"\t\tgit push --recurse-submodules=on-demand ../pub.git master\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"push fails when commit on multiple branches if one branch has no remote">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work/gar/bage &&\n"> <"\t\t>junk4 &&\n"> <"\t\tgit add junk4 &&\n"> <"\t\tgit commit -m \"Fourth junk\"\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\tgit branch branch2 &&\n"> <"\t\tgit add gar/bage &&\n"> <"\t\tgit commit -m \"Fourth commit for gar/bage\" &&\n"> <"\t\tgit checkout branch2 &&\n"> <"\t\t(\n"> <"\t\t\tcd gar/bage &&\n"> <"\t\t\tgit checkout HEAD~1\n"> <"\t\t) &&\n"> <"\t\t>junk1 &&\n"> <"\t\tgit add junk1 &&\n"> <"\t\tgit commit -m \"First junk\" &&\n"> <"\t\ttest_must_fail git push --recurse-submodules=check ../pub.git\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"push succeeds if submodule has no remote and is on the first superproject commit">)} { (SQ <"\n"> <"\tgit init --bare a &&\n"> <"\tgit clone a a1 &&\n"> <"\t(\n"> <"\t\tcd a1 &&\n"> <"\t\tgit init b\n"> <"\t\t(\n"> <"\t\t\tcd b &&\n"> <"\t\t\t>junk &&\n"> <"\t\t\tgit add junk &&\n"> <"\t\t\tgit commit -m \"initial\"\n"> <"\t\t) &&\n"> <"\t\tgit add b &&\n"> <"\t\tgit commit -m \"added submodule\" &&\n"> <"\t\tgit push --recurse-submodule=check origin master\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"push unpushed submodules when not needed">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\t(\n"> <"\t\t\tcd gar/bage &&\n"> <"\t\t\tgit checkout master &&\n"> <"\t\t\t>junk5 &&\n"> <"\t\t\tgit add junk5 &&\n"> <"\t\t\tgit commit -m \"Fifth junk\" &&\n"> <"\t\t\tgit push &&\n"> <"\t\t\tgit rev-parse origin/master >../../../expected\n"> <"\t\t) &&\n"> <"\t\tgit checkout master &&\n"> <"\t\tgit add gar/bage &&\n"> <"\t\tgit commit -m \"Fifth commit for gar/bage\" &&\n"> <"\t\tgit push --recurse-submodules=on-demand ../pub.git master\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd submodule.git &&\n"> <"\t\tgit rev-parse master >../actual\n"> <"\t) &&\n"> <"\ttest_cmp expected actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"push unpushed submodules when not needed 2">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd submodule.git &&\n"> <"\t\tgit rev-parse master >../expected\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\t(\n"> <"\t\t\tcd gar/bage &&\n"> <"\t\t\t>junk6 &&\n"> <"\t\t\tgit add junk6 &&\n"> <"\t\t\tgit commit -m \"Sixth junk\"\n"> <"\t\t) &&\n"> <"\t\t>junk2 &&\n"> <"\t\tgit add junk2 &&\n"> <"\t\tgit commit -m \"Second junk for work\" &&\n"> <"\t\tgit push --recurse-submodules=on-demand ../pub.git master\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd submodule.git &&\n"> <"\t\tgit rev-parse master >../actual\n"> <"\t) &&\n"> <"\ttest_cmp expected actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"push unpushed submodules recursively">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\t(\n"> <"\t\t\tcd gar/bage &&\n"> <"\t\t\tgit checkout master &&\n"> <"\t\t\t> junk7 &&\n"> <"\t\t\tgit add junk7 &&\n"> <"\t\t\tgit commit -m \"Seventh junk\" &&\n"> <"\t\t\tgit rev-parse master >../../../expected\n"> <"\t\t) &&\n"> <"\t\tgit checkout master &&\n"> <"\t\tgit add gar/bage &&\n"> <"\t\tgit commit -m \"Seventh commit for gar/bage\" &&\n"> <"\t\tgit push --recurse-submodules=on-demand ../pub.git master\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd submodule.git &&\n"> <"\t\tgit rev-parse master >../actual\n"> <"\t) &&\n"> <"\ttest_cmp expected actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"push unpushable submodule recursively fails">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd work &&\n"> <"\t\t(\n"> <"\t\t\tcd gar/bage &&\n"> <"\t\t\tgit rev-parse origin/master >../../../expected &&\n"> <"\t\t\tgit checkout master~0 &&\n"> <"\t\t\t> junk8 &&\n"> <"\t\t\tgit add junk8 &&\n"> <"\t\t\tgit commit -m \"Eighth junk\"\n"> <"\t\t) &&\n"> <"\t\tgit add gar/bage &&\n"> <"\t\tgit commit -m \"Eighth commit for gar/bage\" &&\n"> <"\t\ttest_must_fail git push --recurse-submodules=on-demand ../pub.git master\n"> <"\t) &&\n"> <"\t(\n"> <"\t\tcd submodule.git &&\n"> <"\t\tgit rev-parse master >../actual\n"> <"\t) &&\n"> <"\ttest_cmp expected actual\n"> ) } ) (C {(test_done)}) ] )