Merge branch 'sb/branch-attributes'

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index e71581a95dd86949eab8c56d99d11f5f3ca3c3ba..df0ae4811b29668c8c0918fec3d7b7b14369dee9 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -27,6 +27,16 @@ test_expect_success "clone and setup child repos" '
                echo "URL: ../one/.git/"
                echo "Pull: refs/heads/master:refs/heads/one"
        } >.git/remotes/one
+       cd .. &&
+       git clone . three &&
+       cd three &&
+       git repo-config branch.master.remote two &&
+       git repo-config branch.master.merge refs/heads/one &&
+       {
+               echo "URL: ../two/.git/"
+               echo "Pull: refs/heads/master:refs/heads/two"
+               echo "Pull: refs/heads/one:refs/heads/one"
+       } >.git/remotes/two
 '
 
 test_expect_success "fetch test" '
@@ -41,4 +51,19 @@ test_expect_success "fetch test" '
        test "z$mine" = "z$his"
 '
 
+test_expect_success "fetch test for-merge" '
+       cd "$D" &&
+       cd three &&
+       git fetch &&
+       test -f .git/refs/heads/two &&
+       test -f .git/refs/heads/one &&
+       master_in_two=`cd ../two && git rev-parse master` &&
+       one_in_two=`cd ../two && git rev-parse one` &&
+       {
+               echo "$master_in_two    not-for-merge"
+               echo "$one_in_two       "
+       } >expected &&
+       cut -f -2 .git/FETCH_HEAD >actual &&
+       diff expected actual'
+
 test_done