git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/2] t3200-branch: test setting branch as own upstream

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Feb 28, 2014, 06:55 UTC
Message-ID
<531032DD.9000904@viscovery.net>
In-Reply-To
<20140228053703.GA32556@sigill.intra.peff.net>
Am 2/28/2014 6:37, schrieb Jeff King:
Show 20 quoted lines
> On Fri, Feb 28, 2014 at 12:04:18PM +0900, Brian Gesiak wrote:
> 
>> No test asserts that "git branch -u refs/heads/my-branch my-branch"
>> emits a warning. Add a test that does so.
> 
> For an operation like "git branch foo origin" where setting up the
> tracking is a side effect, a warning makes sense. But the sole purpose
> of the command above is to set the upstream, and we didn't do it; should
> this warning actually be upgraded to an error?
> 
>> +test_expect_success '--set-upstream-to shows warning if used to set branch as own upstream' '
>> +	git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
>> +	cat >expected <<EOF &&
>> +warning: Not setting branch my13 as its own upstream.
>> +EOF
>> +	test_cmp expected actual
>> +'
> 
> This should use test_i18ncmp, as the string you are matching is
> internationalized.

More generally, stderr output shouldn't be tested with test_cmp or test_i18ncmp at all, but with grep and test_i18ngrep. The reason is that when you run the test with 'sh -x t3200* -v -i', the trace output is also in stderr, and the test_cmp/test_i18ncmp fails due to the unexpected extra text.

-- Hannes
Previous: brian m. carlsonNext: Jeff King
Message 9 of 22 in “t3200-branch: test setting branch as own upstream”
  1. 1/2 t3200-branch: test setting branch as own upstreamBrian Gesiak, Feb 28, 2014
  2. 2/2 branch: use skip_prefixBrian Gesiak, Feb 28, 2014
  3. Jeff KingFeb 28, 2014
  4. Junio C HamanoMar 3, 2014
  5. Jeff KingFeb 28, 2014
  6. Brian GesiakFeb 28, 2014
  7. Jeff KingFeb 28, 2014
  8. brian m. carlsonFeb 28, 2014
  9. Johannes SixtFeb 28, 2014
  10. Jeff KingFeb 28, 2014
  11. Jeff KingFeb 28, 2014
  12. Brian GesiakFeb 28, 2014
  13. Jeff KingFeb 28, 2014
  14. Brian GesiakFeb 28, 2014
  15. Jeff KingFeb 28, 2014
  16. Brian GesiakFeb 28, 2014
  17. Jeff KingFeb 28, 2014
  18. Matthieu MoyFeb 28, 2014
  19. branch: die when setting branch as own upstreamBrian Gesiak, Mar 1, 2014
  20. 3/3 branch: die when setting branch as own upstreamBrian Gesiak, Mar 1, 2014
  21. Brian GesiakMar 1, 2014
  22. Johannes SixtFeb 28, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.