Merge branch 'nd/fetch-ref-summary'
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:48:34 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:48:35 +0000 (14:48 -0700)
Hotfix of a test in a topic that has already been merged to 'master'.

* nd/fetch-ref-summary:
t5510: skip tests under GETTEXT_POISON build

1  2 
t/t5510-fetch.sh
diff --combined t/t5510-fetch.sh
index 6bd4853079ea3215edaf2c409d8ae0548f5efe3a,6aa63b1e745ec2b5c744111cd28f283422800363..668c54be41eb4fda17e9b43000081c7b374990c2
@@@ -644,7 -644,7 +644,7 @@@ test_expect_success 'fetch --prune prin
                git fetch --prune origin 2>&1 | head -n1 >../actual
        ) &&
        echo "From ${D}/." >expect &&
 -      test_cmp expect actual
 +      test_i18ncmp expect actual
  '
  
  test_expect_success 'branchname D/F conflict resolved by --prune' '
@@@ -688,7 -688,7 +688,7 @@@ test_expect_success 'fetching with auto
        )
  '
  
- test_expect_success 'fetch aligned output' '
+ test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
        git clone . full-output &&
        test_commit looooooooooooong-tag &&
        (
        test_cmp expect actual
  '
  
- test_expect_success 'fetch compact output' '
+ test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
        git clone . compact &&
        test_commit extraaa &&
        (