Am 17.02.2011 17:18, schrieb Spencer E. Olson: > This patch adds two new test cases in t7406 to ensure that the --merge/--rebase > options are ignored for "git submodule update" with new modules. These test > that a simple checkout is performed instead. > > Signed-off-by: Spencer E. Olson <olsonse@xxxxxxxxx> > --- > t/t7406-submodule-update.sh | 24 ++++++++++++++++++++++++ > 1 files changed, 24 insertions(+), 0 deletions(-) > > diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh > index bfb4975..141251c 100755 > --- a/t/t7406-submodule-update.sh > +++ b/t/t7406-submodule-update.sh > @@ -203,4 +203,28 @@ test_expect_success 'submodule init picks up merge' ' > ) > ' > > +test_expect_success 'submodule update --merge - ignores --merge for new submodules' ' > + (cd super && > + rm -rf submodule && > + git submodule update submodule && > + git submodule status submodule >expect && > + rm -rf submodule && > + git submodule update --merge submodule && > + git submodule status submodule >actual && > + test_cmp expect actual > + ) > +' > + > +test_expect_success 'submodule update --rebase - ignores --rebase for new submodules' ' > + (cd super && > + rm -rf submodule && > + git submodule update submodule && > + git submodule status submodule >expect && > + rm -rf submodule && > + git submodule update --rebase submodule && > + git submodule status submodule >actual && > + test_cmp expect actual > + ) > +' > + > test_done Thanks for writing these tests! Unfortunately the first new test doesn't fail for me with current git. This should be fixed to be able to detect regressions in the future, so I came up with replacing the "git submodule status submodule" calls with "git status -s submodule", which did the trick for me. Apart from that tests which cover the case when rebase or merge are configured via "submodule.<name>.update" would help, as that triggers the same problem. So maybe you want to squash the following diff in, then feel free to add: Acked-by: Jens Lehmann <Jens.Lehmann@xxxxxx> diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 141251c..fa9d23a 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -207,10 +207,10 @@ test_expect_success 'submodule update --merge - ignores --merge for new submod (cd super && rm -rf submodule && git submodule update submodule && - git submodule status submodule >expect && + git status -s submodule >expect && rm -rf submodule && git submodule update --merge submodule && - git submodule status submodule >actual && + git status -s submodule >actual && test_cmp expect actual ) ' @@ -219,10 +219,38 @@ test_expect_success 'submodule update --rebase - ignores --rebase for new submod (cd super && rm -rf submodule && git submodule update submodule && - git submodule status submodule >expect && + git status -s submodule >expect && rm -rf submodule && git submodule update --rebase submodule && - git submodule status submodule >actual && + git status -s submodule >actual && + test_cmp expect actual + ) +' + +test_expect_success 'submodule update ignores update=merge config for new submodules' ' + (cd super && + rm -rf submodule && + git submodule update submodule && + git status -s submodule >expect && + rm -rf submodule && + git config submodule.submodule.update merge && + git submodule update submodule && + git status -s submodule >actual && + git config --unset submodule.submodule.update && + test_cmp expect actual + ) +' + +test_expect_success 'submodule update ignores update=rebase config for new submodules' ' + (cd super && + rm -rf submodule && + git submodule update submodule && + git status -s submodule >expect && + rm -rf submodule && + git config submodule.submodule.update rebase && + git submodule update submodule && + git status -s submodule >actual && + git config --unset submodule.submodule.update && test_cmp expect actual ) ' -- 1.7.4.1.109.g3d8f5 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html