tests: document cherry-pick behavior in face of conflicts

diff --git a/t/t5506-remote-groups.sh b/t/t5506-remote-groups.sh
index 2a1806b0b4427abb410d0310ba8c1ec52f8bde58..b7b7ddaa403d7a06c0203b89e484d56d20863f4a 100755 (executable)
--- a/t/t5506-remote-groups.sh
+++ b/t/t5506-remote-groups.sh
@@ -51,7 +51,7 @@ test_expect_success 'nonexistant group produces error' '
        ! repo_fetched two
 '
 
-test_expect_success 'updating group updates all members' '
+test_expect_success 'updating group updates all members (remote update)' '
        mark group-all &&
        update_repos &&
        git config --add remotes.all one &&
@@ -61,7 +61,15 @@ test_expect_success 'updating group updates all members' '
        repo_fetched two
 '
 
-test_expect_success 'updating group does not update non-members' '
+test_expect_success 'updating group updates all members (fetch)' '
+       mark fetch-group-all &&
+       update_repos &&
+       git fetch all &&
+       repo_fetched one &&
+       repo_fetched two
+'
+
+test_expect_success 'updating group does not update non-members (remote update)' '
        mark group-some &&
        update_repos &&
        git config --add remotes.some one &&
@@ -70,6 +78,15 @@ test_expect_success 'updating group does not update non-members' '
        ! repo_fetched two
 '
 
+test_expect_success 'updating group does not update non-members (fetch)' '
+       mark fetch-group-some &&
+       update_repos &&
+       git config --add remotes.some one &&
+       git remote update some &&
+       repo_fetched one &&
+       ! repo_fetched two
+'
+
 test_expect_success 'updating remote name updates that remote' '
        mark remote-name &&
        update_repos &&