X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft5510-fetch.sh;h=308c02ea75f3400b4d215e6091f03179a93943ad;hb=92b7aacbbc654de4cfae6806bc92cf81ec1823aa;hp=9d72b16393e3cbee30d16519ae641e84d7485f39;hpb=efe4be12490ab684786c48135731c4d2648bbecc;p=git.git diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 9d72b1639..308c02ea7 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -78,8 +78,8 @@ test_expect_success "fetch test for-merge" ' 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 " + echo "$master_in_two not-for-merge" } >expected && cut -f -2 .git/FETCH_HEAD >actual && test_cmp expected actual' @@ -174,7 +174,7 @@ test_expect_success 'fetch must not resolve short tag name' ' ' -test_expect_success 'fetch must not resolve short remote name' ' +test_expect_success 'fetch can now resolve short remote name' ' cd "$D" && git update-ref refs/remotes/six/HEAD HEAD && @@ -183,8 +183,7 @@ test_expect_success 'fetch must not resolve short remote name' ' cd six && git init && - test_must_fail git fetch .. six:six - + git fetch .. six:six ' test_expect_success 'create bundle 1' '