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

Re: [PATCH 0/7] Improve git-pull test coverage

From
Paul Tan <pyokagan@gmail.com>
Date
May 5, 2015, 10:39 UTC
Message-ID
<CACRoPnSJdMmJNQ4xrKr5Og6rZOjCm4Ad8rv5dVfTZod6d5pKWg@mail.gmail.com>
In-Reply-To
<xmqqlhh4tfd0.fsf@gitster.dls.corp.google.com>
Hi Junio,
On Tue, May 5, 2015 at 1:35 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 8 quoted lines
> I didn't like the grepping of error messages alone as a way to
> diagnose the failure, though.  When we expect the pull to fail
> without touching anything in the working tree, I'd prefer to see
> that tested explicitly (e.g. "if pull mistakenly tried to go ahead
> and touch this file that would be involved in the merge, its
> contents would change---let's make sure that does not happen by
> making sure the contents before and after are the same" kind of
> thing).

Yes, you're right. Some tests do need these additional checks. Will add them in the re-roll.

Just to be sure, aside from checking that git-pull does not touch files it should not touch in the event of an error, I do believe we also need to check its error message, as printing out the correct user-friendly error messages is one of the features of git-pull.

Regards, Paul

Previous: Junio C HamanoNext: Paul Tan
Message 20 of 21 in “Improve git-pull test coverage”
  1. 0/7 Improve git-pull test coveragePaul Tan, May 2, 2015
  2. 1/7 t5520: test pulling multiple branches into an empty repositoryPaul Tan, May 2, 2015
  3. 2/7 t5520: implement tests for no merge candidates casesPaul Tan, May 2, 2015
  4. Matthieu MoyMay 4, 2015
  5. Paul TanMay 6, 2015
  6. Paul TanMay 6, 2015
  7. 3/7 t5520: test for failure if index has unresolved entriesPaul Tan, May 2, 2015
  8. Matthieu MoyMay 4, 2015
  9. 4/7 t5520: test work tree fast-forward when fetch updates headPaul Tan, May 2, 2015
  10. Eric SunshineMay 3, 2015
  11. Paul TanMay 3, 2015
  12. 5/7 t5520: test --rebase with multiple branchesPaul Tan, May 2, 2015
  13. Stefan BellerMay 4, 2015
  14. Junio C HamanoMay 4, 2015
  15. Paul TanMay 5, 2015
  16. 6/7 t5520: test --rebase failure on unborn branch with indexPaul Tan, May 2, 2015
  17. 7/7 t5521: test --dry-run does not make any changesPaul Tan, May 2, 2015
  18. Matthieu MoyMay 4, 2015
  19. Junio C HamanoMay 4, 2015
  20. Paul TanMay 5, 2015
  21. Paul TanMay 6, 2015

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.