{"thread":{"id":"26535","subject":"[PATCH 1/2 (v2)] submodule: no [--merge|--rebase] when newly cloned","startedAt":"2011-02-17T16:18:45Z","lastAt":"2011-02-17T23:50:15Z","messageCount":11,"participants":["Spencer E. Olson","Jens Lehmann","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":2},"messages":[{"id":"161426","messageId":"1297959526-8089-1-git-send-email-olsonse@umich.edu","threadId":"26535","inReplyTo":null,"subject":"[PATCH 1/2 (v2)] submodule: no [--merge|--rebase] when newly cloned","fromName":"Spencer E. Olson","fromEmail":"olsonse@umich.edu","sentAt":"2011-02-17T16:18:45Z","receivedAt":"2011-02-17T16:18:45Z","isPatch":true,"sender":{"key":"olsonse@umich.edu","avatar":"https://avatars.githubusercontent.com/u/148647?v=4"},"body":"Previously, when a new submodule is cloned by running \"git submodule update\n[--merge|--rebase]\", the newly cloned submodule does not get checked out and a\nrebase or merge is incorrectly attempted against an empty working directory.\nThis patch ignores --rebase or --merge for new submodules and instead simply\nchecks out the appropriate revision.\n\nSigned-off-by: Spencer E. Olson <olsonse@umich.edu>\n---\n git-submodule.sh |   21 +++++++++++++++++++++\n 1 files changed, 21 insertions(+), 0 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 8b90589..7724885 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -365,6 +365,19 @@ cmd_init()\n }\n \n #\n+# Test whether an element of the ';' separated list $2 matches $1\n+#\n+list_contains()\n+{\n+\tcase \"$2;\" in\n+\t*\";$1;\"*)\n+\t\t: yes ;;\n+\t*)\n+\t\t! : no ;;\n+\tesac\n+}\n+\n+#\n # Update each submodule path to correct revision, using clone and checkout as needed\n #\n # $@ = requested paths (default to all)\n@@ -423,6 +436,7 @@ cmd_update()\n \t\tcmd_init \"--\" \"$@\" || return\n \tfi\n \n+\tcloned_modules=\n \tmodule_list \"$@\" |\n \twhile read mode sha1 stage path\n \tdo\n@@ -442,6 +456,7 @@ cmd_update()\n \t\tif ! test -d \"$path\"/.git -o -f \"$path\"/.git\n \t\tthen\n \t\t\tmodule_clone \"$path\" \"$url\" \"$reference\"|| exit\n+\t\t\tcloned_modules=\"$cloned_modules;$name\"\n \t\t\tsubsha1=\n \t\telse\n \t\t\tsubsha1=$(clear_local_git_env; cd \"$path\" &&\n@@ -469,6 +484,12 @@ cmd_update()\n \t\t\t\tdie \"Unable to fetch in submodule path '$path'\"\n \t\t\tfi\n \n+\t\t\tlist_contains \"$name\" \"$cloned_modules\"\n+\t\t\tif test \"$?\" = 0\n+\t\t\tthen\n+\t\t\t\tupdate_module=\n+\t\t\tfi\n+\n \t\t\tcase \"$update_module\" in\n \t\t\trebase)\n \t\t\t\tcommand=\"git rebase\"\n-- \n1.7.4.1.42.g43f9f\n"},{"id":"161427","messageId":"1297959526-8089-2-git-send-email-olsonse@umich.edu","threadId":"26535","inReplyTo":"1297959526-8089-1-git-send-email-olsonse@umich.edu","subject":"[PATCH 2/2 (v2)] t7406: \"git submodule update {--merge|--rebase]\" with new submodules","fromName":"Spencer E. Olson","fromEmail":"olsonse@umich.edu","sentAt":"2011-02-17T16:18:46Z","receivedAt":"2011-02-17T16:18:46Z","isPatch":true,"sender":{"key":"olsonse@umich.edu","avatar":"https://avatars.githubusercontent.com/u/148647?v=4"},"body":"This patch adds two new test cases in t7406 to ensure that the --merge/--rebase\noptions are ignored for \"git submodule update\" with new modules.  These test\nthat a simple checkout is performed instead.\n\nSigned-off-by: Spencer E. Olson <olsonse@umich.edu>\n---\n t/t7406-submodule-update.sh |   24 ++++++++++++++++++++++++\n 1 files changed, 24 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh\nindex bfb4975..141251c 100755\n--- a/t/t7406-submodule-update.sh\n+++ b/t/t7406-submodule-update.sh\n@@ -203,4 +203,28 @@ test_expect_success 'submodule init picks up merge' '\n \t)\n '\n \n+test_expect_success 'submodule update --merge  - ignores --merge  for new submodules' '\n+\t(cd super &&\n+\t rm -rf submodule &&\n+\t git submodule update submodule &&\n+\t git submodule status submodule >expect &&\n+\t rm -rf submodule &&\n+\t git submodule update --merge submodule &&\n+\t git submodule status submodule >actual &&\n+\t test_cmp expect actual\n+\t)\n+'\n+\n+test_expect_success 'submodule update --rebase - ignores --rebase for new submodules' '\n+\t(cd super &&\n+\t rm -rf submodule &&\n+\t git submodule update submodule &&\n+\t git submodule status submodule >expect &&\n+\t rm -rf submodule &&\n+\t git submodule update --rebase submodule &&\n+\t git submodule status submodule >actual &&\n+\t test_cmp expect actual\n+\t)\n+'\n+\n test_done\n-- \n1.7.4.1.42.g43f9f\n"},{"id":"161437","messageId":"4D5D7A06.6050700@web.de","threadId":"26535","inReplyTo":"1297959526-8089-1-git-send-email-olsonse@umich.edu","subject":"Re: [PATCH 1/2 (v2)] submodule: no [--merge|--rebase] when newly cloned","fromName":"Jens Lehmann","fromEmail":"jens.lehmann@web.de","sentAt":"2011-02-17T19:41:58Z","receivedAt":"2011-02-17T19:41:58Z","isPatch":true,"sender":{"key":"jens.lehmann@web.de","avatar":"https://avatars.githubusercontent.com/u/135220?v=4"},"body":"Am 17.02.2011 17:18, schrieb Spencer E. Olson:\n> Previously, when a new submodule is cloned by running \"git submodule update\n> [--merge|--rebase]\", the newly cloned submodule does not get checked out and a\n> rebase or merge is incorrectly attempted against an empty working directory.\n> This patch ignores --rebase or --merge for new submodules and instead simply\n> checks out the appropriate revision.\n\nNice work, thanks!\n\nJust a small thing: This problem also happens when the configuration\n\"submodule.<name>.update\" is set to either \"rebase\" or \"merge\", not only\nwhen using the command line options. So perhaps you could reword the topic\nto something like \"submodule: don't merge or rebase when newly cloned\" and\nadjust both commit messages a bit?\n\nApart from that:\nAcked-by: Jens Lehmann <Jens.Lehmann@web.de>\n"},{"id":"161438","messageId":"4D5D7A45.6020204@web.de","threadId":"26535","inReplyTo":"1297959526-8089-2-git-send-email-olsonse@umich.edu","subject":"Re: [PATCH 2/2 (v2)] t7406: \"git submodule update {--merge|--rebase]\" with new submodules","fromName":"Jens Lehmann","fromEmail":"jens.lehmann@web.de","sentAt":"2011-02-17T19:43:01Z","receivedAt":"2011-02-17T19:43:01Z","isPatch":true,"sender":{"key":"jens.lehmann@web.de","avatar":"https://avatars.githubusercontent.com/u/135220?v=4"},"body":"Am 17.02.2011 17:18, schrieb Spencer E. Olson:\n> This patch adds two new test cases in t7406 to ensure that the --merge/--rebase\n> options are ignored for \"git submodule update\" with new modules.  These test\n> that a simple checkout is performed instead.\n> \n> Signed-off-by: Spencer E. Olson <olsonse@umich.edu>\n> ---\n>  t/t7406-submodule-update.sh |   24 ++++++++++++++++++++++++\n>  1 files changed, 24 insertions(+), 0 deletions(-)\n> \n> diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh\n> index bfb4975..141251c 100755\n> --- a/t/t7406-submodule-update.sh\n> +++ b/t/t7406-submodule-update.sh\n> @@ -203,4 +203,28 @@ test_expect_success 'submodule init picks up merge' '\n>  \t)\n>  '\n>  \n> +test_expect_success 'submodule update --merge  - ignores --merge  for new submodules' '\n> +\t(cd super &&\n> +\t rm -rf submodule &&\n> +\t git submodule update submodule &&\n> +\t git submodule status submodule >expect &&\n> +\t rm -rf submodule &&\n> +\t git submodule update --merge submodule &&\n> +\t git submodule status submodule >actual &&\n> +\t test_cmp expect actual\n> +\t)\n> +'\n> +\n> +test_expect_success 'submodule update --rebase - ignores --rebase for new submodules' '\n> +\t(cd super &&\n> +\t rm -rf submodule &&\n> +\t git submodule update submodule &&\n> +\t git submodule status submodule >expect &&\n> +\t rm -rf submodule &&\n> +\t git submodule update --rebase submodule &&\n> +\t git submodule status submodule >actual &&\n> +\t test_cmp expect actual\n> +\t)\n> +'\n> +\n>  test_done\n\nThanks for writing these tests!\n\nUnfortunately the first new test doesn't fail for me with current git.\nThis should be fixed to be able to detect regressions in the future, so\nI came up with replacing the \"git submodule status submodule\" calls with\n\"git status -s submodule\", which did the trick for me.\n\nApart from that tests which cover the case when rebase or merge are\nconfigured via \"submodule.<name>.update\" would help, as that triggers\nthe same problem.\n\nSo maybe you want to squash the following diff in, then feel free to add:\nAcked-by: Jens Lehmann <Jens.Lehmann@web.de>\n\n\ndiff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh\nindex 141251c..fa9d23a 100755\n--- a/t/t7406-submodule-update.sh\n+++ b/t/t7406-submodule-update.sh\n@@ -207,10 +207,10 @@ test_expect_success 'submodule update --merge  - ignores --merge  for new submod\n \t(cd super &&\n \t rm -rf submodule &&\n \t git submodule update submodule &&\n-\t git submodule status submodule >expect &&\n+\t git status -s submodule >expect &&\n \t rm -rf submodule &&\n \t git submodule update --merge submodule &&\n-\t git submodule status submodule >actual &&\n+\t git status -s submodule >actual &&\n \t test_cmp expect actual\n \t)\n '\n@@ -219,10 +219,38 @@ test_expect_success 'submodule update --rebase - ignores --rebase for new submod\n \t(cd super &&\n \t rm -rf submodule &&\n \t git submodule update submodule &&\n-\t git submodule status submodule >expect &&\n+\t git status -s submodule >expect &&\n \t rm -rf submodule &&\n \t git submodule update --rebase submodule &&\n-\t git submodule status submodule >actual &&\n+\t git status -s submodule >actual &&\n+\t test_cmp expect actual\n+\t)\n+'\n+\n+test_expect_success 'submodule update ignores update=merge config for new submodules' '\n+\t(cd super &&\n+\t rm -rf submodule &&\n+\t git submodule update submodule &&\n+\t git status -s submodule >expect &&\n+\t rm -rf submodule &&\n+\t git config submodule.submodule.update merge &&\n+\t git submodule update submodule &&\n+\t git status -s submodule >actual &&\n+\t git config --unset submodule.submodule.update &&\n+\t test_cmp expect actual\n+\t)\n+'\n+\n+test_expect_success 'submodule update ignores update=rebase config for new submodules' '\n+\t(cd super &&\n+\t rm -rf submodule &&\n+\t git submodule update submodule &&\n+\t git status -s submodule >expect &&\n+\t rm -rf submodule &&\n+\t git config submodule.submodule.update rebase &&\n+\t git submodule update submodule &&\n+\t git status -s submodule >actual &&\n+\t git config --unset submodule.submodule.update &&\n \t test_cmp expect actual\n \t)\n '\n-- \n1.7.4.1.109.g3d8f5\n"},{"id":"161446","messageId":"7vbp2abfay.fsf@alter.siamese.dyndns.org","threadId":"26535","inReplyTo":"1297959526-8089-1-git-send-email-olsonse@umich.edu","subject":"Re: [PATCH 1/2 (v2)] submodule: no [--merge|--rebase] when newly cloned","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-17T20:02:13Z","receivedAt":"2011-02-17T20:02:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Spencer E. Olson\" <olsonse@umich.edu> writes:\n\n> @@ -469,6 +484,12 @@ cmd_update()\n>  \t\t\t\tdie \"Unable to fetch in submodule path '$path'\"\n>  \t\t\tfi\n>  \n> +\t\t\tlist_contains \"$name\" \"$cloned_modules\"\n> +\t\t\tif test \"$?\" = 0\n> +\t\t\tthen\n> +\t\t\t\tupdate_module=\n> +\t\t\tfi\n> +\n\nIt would be a lot easier to read if you said this:\n\n\tif list_contains \"$name\" \"$cloned_modules\"\n        then\n\t\tupdate_module=\n\tfi\n\nor just open code the idiom:\n\n\tcase \";list-of-stuff-with-delimiter;\" in\n        *\";i-want-to-see-this;\"*) : happy ;;\n\tesac\n\nwithout introducing \"list_contains\" that is called only once.\n\nBut otherwise the patch looks good.\n\nThanks.\n\n-- >8 --\nFrom: Spencer E. Olson <olsonse@umich.edu>\nDate: Thu, 17 Feb 2011 09:18:45 -0700\nSubject: [PATCH] submodule: no [--merge|--rebase] when newly cloned\n\nPreviously, when a new submodule is cloned by running \"git submodule update\n[--merge|--rebase]\", the newly cloned submodule does not get checked out and a\nrebase or merge is incorrectly attempted against an empty working directory.\nThis patch ignores --rebase or --merge for new submodules and instead simply\nchecks out the appropriate revision.\n\nSigned-off-by: Spencer E. Olson <olsonse@umich.edu>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n git-submodule.sh |    9 +++++++++\n 1 files changed, 9 insertions(+), 0 deletions(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 8b90589..5e989b7 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -423,6 +423,7 @@ cmd_update()\n \t\tcmd_init \"--\" \"$@\" || return\n \tfi\n \n+\tcloned_modules=\n \tmodule_list \"$@\" |\n \twhile read mode sha1 stage path\n \tdo\n@@ -442,6 +443,7 @@ cmd_update()\n \t\tif ! test -d \"$path\"/.git -o -f \"$path\"/.git\n \t\tthen\n \t\t\tmodule_clone \"$path\" \"$url\" \"$reference\"|| exit\n+\t\t\tcloned_modules=\"$cloned_modules;$name\"\n \t\t\tsubsha1=\n \t\telse\n \t\t\tsubsha1=$(clear_local_git_env; cd \"$path\" &&\n@@ -469,6 +471,13 @@ cmd_update()\n \t\t\t\tdie \"Unable to fetch in submodule path '$path'\"\n \t\t\tfi\n \n+\t\t\t# Is this something we just cloned?\n+\t\t\tcase \";$cloned_modules;\" in\n+\t\t\t*\";$name;\"*)\n+\t\t\t\t# then there is no local change to integrate\n+\t\t\t\tupdate_module= ;;\n+\t\t\tesac\n+\n \t\t\tcase \"$update_module\" in\n \t\t\trebase)\n \t\t\t\tcommand=\"git rebase\"\n-- \n1.7.4.1.107.ga7184\n"},{"id":"161448","messageId":"7v4o82bekf.fsf@alter.siamese.dyndns.org","threadId":"26535","inReplyTo":"4D5D7A45.6020204@web.de","subject":"Re: [PATCH 2/2 (v2)] t7406: \"git submodule update {--merge|--rebase]\" with new submodules","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-17T20:18:08Z","receivedAt":"2011-02-17T20:18:08Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jens Lehmann <Jens.Lehmann@web.de> writes:\n\n> This should be fixed to be able to detect regressions in the future, so\n> I came up with replacing the \"git submodule status submodule\" calls with\n> \"git status -s submodule\", which did the trick for me.\n\nHmph, is that a bug in \"git submodule status\" or is the subcommand\ndeliberately designed to ignore this class of differences?\n"},{"id":"161449","messageId":"7vzkpu9zo0.fsf@alter.siamese.dyndns.org","threadId":"26535","inReplyTo":"4D5D7A06.6050700@web.de","subject":"Re: [PATCH 1/2 (v2)] submodule: no [--merge|--rebase] when newly cloned","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-17T20:25:19Z","receivedAt":"2011-02-17T20:25:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jens Lehmann <Jens.Lehmann@web.de> writes:\n\n> Am 17.02.2011 17:18, schrieb Spencer E. Olson:\n>> Previously, when a new submodule is cloned by running \"git submodule update\n>> [--merge|--rebase]\", the newly cloned submodule does not get checked out and a\n>> rebase or merge is incorrectly attempted against an empty working directory.\n>> This patch ignores --rebase or --merge for new submodules and instead simply\n>> checks out the appropriate revision.\n>\n> Nice work, thanks!\n>\n> Just a small thing: This problem also happens when the configuration\n> \"submodule.<name>.update\" is set to either \"rebase\" or \"merge\", not only\n> when using the command line options. So perhaps you could reword the topic\n> to something like \"submodule: don't merge or rebase when newly cloned\" and\n> adjust both commit messages a bit?\n\nI tentatively queued with this rewrite (the patch text is the same as the\none I sent previously).\n\n    From: Spencer E. Olson <olsonse@umich.edu>\n    Date: Thu, 17 Feb 2011 09:18:45 -0700\n    Subject: [PATCH] submodule: no [--merge|--rebase] when newly cloned\n\n    \"git submodule update\" can be run with either the \"--merge\" or \"--rebase\"\n    option, or submodule.<name>.update configuration variable can be set to\n    \"merge\" or \"rebase, to cause local work to get integrated when updating\n    the submodule.\n\n    When a submodule is newly cloned, however, it does not have a check out\n    when a rebase or merge is attempted, leading to a failure.  For newly\n    cloned submodules, simply check out the appropriate revision.  There is no\n    local work to integrate with for them.\n\n    Signed-off-by: Spencer E. Olson <olsonse@umich.edu>\n    Acked-by: Jens Lehmann <Jens.Lehmann@web.de>\n    Signed-off-by: Junio C Hamano <gitster@pobox.com>\n"},{"id":"161460","messageId":"4D5D95AF.6080106@web.de","threadId":"26535","inReplyTo":"7v4o82bekf.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 2/2 (v2)] t7406: \"git submodule update {--merge|--rebase]\" with new submodules","fromName":"Jens Lehmann","fromEmail":"jens.lehmann@web.de","sentAt":"2011-02-17T21:39:59Z","receivedAt":"2011-02-17T21:39:59Z","isPatch":true,"sender":{"key":"jens.lehmann@web.de","avatar":"https://avatars.githubusercontent.com/u/135220?v=4"},"body":"Am 17.02.2011 21:18, schrieb Junio C Hamano:\n> Jens Lehmann <Jens.Lehmann@web.de> writes:\n> \n>> This should be fixed to be able to detect regressions in the future, so\n>> I came up with replacing the \"git submodule status submodule\" calls with\n>> \"git status -s submodule\", which did the trick for me.\n> \n> Hmph, is that a bug in \"git submodule status\" or is the subcommand\n> deliberately designed to ignore this class of differences?\n\nThe latter, it doesn't care about working tree modifications inside of\nsubmodules as It uses the \"--ignore-submodules=dirty\" option when calling\n\"git diff-files\" (I added that in 18076502). The reason for one test to\nsucceed and the other to fail is that the merge succeeds even though\nthe work tree is empty while rebase errors out. So \"git submodule status\"\nis the wrong command to detect work tree differences, that's why we have\nto use \"git status\" here.\n"},{"id":"161464","messageId":"201102171517.15906.olsonse@umich.edu","threadId":"26535","inReplyTo":"7vzkpu9zo0.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 1/2 (v2)] submodule: no [--merge|--rebase] when newly cloned","fromName":"Spencer E. Olson","fromEmail":"olsonse@umich.edu","sentAt":"2011-02-17T22:17:15Z","receivedAt":"2011-02-17T22:17:15Z","isPatch":true,"sender":{"key":"olsonse@umich.edu","avatar":"https://avatars.githubusercontent.com/u/148647?v=4"},"body":"This looks fine by me.\n\nWhat about the testing patch?  It'll be a few hours before I can resubmit \nwith \"git submodule status submodule\" changed to \"git status -s submodule\".\n\n\n\nOn Thursday 17 February 2011 13:25, Junio C Hamano wrote:\n> Jens Lehmann <Jens.Lehmann@web.de> writes:\n> > Am 17.02.2011 17:18, schrieb Spencer E. Olson:\n> >> Previously, when a new submodule is cloned by running \"git submodule\n> >> update [--merge|--rebase]\", the newly cloned submodule does not get\n> >> checked out and a rebase or merge is incorrectly attempted against an\n> >> empty working directory. This patch ignores --rebase or --merge for new\n> >> submodules and instead simply checks out the appropriate revision.\n> >\n> > Nice work, thanks!\n> >\n> > Just a small thing: This problem also happens when the configuration\n> > \"submodule.<name>.update\" is set to either \"rebase\" or \"merge\", not only\n> > when using the command line options. So perhaps you could reword the\n> > topic to something like \"submodule: don't merge or rebase when newly\n> > cloned\" and adjust both commit messages a bit?\n>\n> I tentatively queued with this rewrite (the patch text is the same as the\n> one I sent previously).\n>\n>     From: Spencer E. Olson <olsonse@umich.edu>\n>     Date: Thu, 17 Feb 2011 09:18:45 -0700\n>     Subject: [PATCH] submodule: no [--merge|--rebase] when newly cloned\n>\n>     \"git submodule update\" can be run with either the \"--merge\" or\n> \"--rebase\" option, or submodule.<name>.update configuration variable can be\n> set to \"merge\" or \"rebase, to cause local work to get integrated when\n> updating the submodule.\n>\n>     When a submodule is newly cloned, however, it does not have a check out\n>     when a rebase or merge is attempted, leading to a failure.  For newly\n>     cloned submodules, simply check out the appropriate revision.  There is\n> no local work to integrate with for them.\n>\n>     Signed-off-by: Spencer E. Olson <olsonse@umich.edu>\n>     Acked-by: Jens Lehmann <Jens.Lehmann@web.de>\n>     Signed-off-by: Junio C Hamano <gitster@pobox.com>\n"},{"id":"161470","messageId":"7vr5b68c7c.fsf@alter.siamese.dyndns.org","threadId":"26535","inReplyTo":"201102171517.15906.olsonse@umich.edu","subject":"Re: [PATCH 1/2 (v2)] submodule: no [--merge|--rebase] when newly cloned","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-17T23:37:27Z","receivedAt":"2011-02-17T23:37:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Spencer E. Olson\" <olsonse@umich.edu> writes:\n\n> This looks fine by me.\n>\n> What about the testing patch?  It'll be a few hours before I can resubmit \n> with \"git submodule status submodule\" changed to \"git status -s submodule\".\n\nI just squashed the patch from Jens in, with Ack from him.\n"},{"id":"161478","messageId":"201102171650.15312.olsonse@umich.edu","threadId":"26535","inReplyTo":"7vr5b68c7c.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 1/2 (v2)] submodule: no [--merge|--rebase] when newly cloned","fromName":"Spencer E. Olson","fromEmail":"olsonse@umich.edu","sentAt":"2011-02-17T23:50:15Z","receivedAt":"2011-02-17T23:50:15Z","isPatch":true,"sender":{"key":"olsonse@umich.edu","avatar":"https://avatars.githubusercontent.com/u/148647?v=4"},"body":"great, and thanks\n\n\nOn Thursday 17 February 2011 16:37, Junio C Hamano wrote:\n> \"Spencer E. Olson\" <olsonse@umich.edu> writes:\n> > This looks fine by me.\n> >\n> > What about the testing patch?  It'll be a few hours before I can resubmit\n> > with \"git submodule status submodule\" changed to \"git status -s\n> > submodule\".\n>\n> I just squashed the patch from Jens in, with Ack from him.\n"}]}