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

Re: [PATCH v3 1/9] t5520: fixup file contents comparisons

From
Michael Blume <blume.mike@gmail.com>
Date
May 14, 2015, 17:29 UTC
Message-ID
<CAO2U3QgD0-tAwGnMeeMR5aqbUuqDsdWy0Sw8dQBPUpUNwJZpHg@mail.gmail.com>
In-Reply-To
<xmqqa8x8bkuc.fsf@gitster.dls.corp.google.com>
On Wed, May 13, 2015 at 7:42 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 40 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Paul Tan <pyokagan@gmail.com> writes:
>>
>>> Replace the above 2 forms with:
>>>
>>>      verbose test "$(cat file)" = expected
>>
>> Quoting is very much a good idea, but I am not enthused by the
>> vision of having to write verbose everywhere in our script.
>>
>> After seeing a script fail, you can run it again with -i -x options;
>> wouldn't it be sufficient?
>
> Just to avoid misunderstanding, I am unhappy if we have to keep
> writing "verbose test" in that exact form.
>
> Just like we invented to help debugging by wrapping "cmp" with
> "test_cmp" (i.e. we want to see if the file contents are the same,
> but a person who debugs can be helped by seeing the differences when
> the expectation is not met), I do not mind if we had a shorter and
> cleanly-named wrapper that we can use consistently.  E.g. I do not
> mind something like this in test-lib-functions.sh
>
>         test_file_contents () {
>                 if test "$(cat "$1")" != "$2"
>                 then
>                         echo "Contents of file $1 is not $2"
>                         false
>                 fi
>         }
>
> and used like so:
>
>         test_file_contents file expected_string
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
My build starts breaking from this commit, I'm on a mac.
expecting success:
    (cd dst &&
     test_must_fail git pull --rebase &&
     verbose test 1 = "$(find .git/rebase-apply -name "000*" | wc -l)"
    )
First, rewinding head to replay your work on top of it...
Applying: Modified Change 4
Using index info to reconstruct a base tree...
M    stuff
Falling back to patching base and 3-way merge...
Merging HEAD with Modified Change 4
Merging:
814f1c3 Change 4
virtual Modified Change 4
found 1 common ancestor:
virtual e369e858ec1aa73d497d02c4f23e5cf4ae2d3c3b
Auto-merging stuff
CONFLICT (content): Merge conflict in stuff
Failed to merge in the changes.
Patch failed at 0001 Modified Change 4
The copy of the patch that failed is found in:
   /Users/michael.blume/workspace/git/t/trash
directory.t5520-pull/dst/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort".

command failed: 'test' '1' '=' ' 1' not ok 33 - git pull --rebase does not reapply old patches # # (cd dst && # test_must_fail git pull --rebase && # verbose test 1 = "$(find .git/rebase-apply -name "000*" | wc -l)" # ) #

Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 25 in “Improve git-pull test coverage”
  1. 0/9 Improve git-pull test coveragePaul Tan, May 13, 2015
  2. 1/9 t5520: fixup file contents comparisonsPaul Tan, May 13, 2015
  3. Junio C HamanoMay 13, 2015
  4. Junio C HamanoMay 13, 2015
  5. Michael BlumeMay 14, 2015
  6. Junio C HamanoMay 14, 2015
  7. Paul TanMay 15, 2015
  8. Junio C HamanoMay 15, 2015
  9. Junio C HamanoMay 15, 2015
  10. Paul TanMay 16, 2015
  11. Junio C HamanoMay 16, 2015
  12. Junio C HamanoMay 16, 2015
  13. Paul TanMay 17, 2015
  14. 2/9 t5520: ensure origin refs are updatedPaul Tan, May 13, 2015
  15. Junio C HamanoMay 13, 2015
  16. Paul TanMay 18, 2015
  17. 3/9 t5520: test no merge candidates casesPaul Tan, May 13, 2015
  18. 4/9 t5520: test for failure if index has unresolved entriesPaul Tan, May 13, 2015
  19. Matthieu MoyMay 13, 2015
  20. Paul TanMay 15, 2015
  21. 5/9 t5520: test work tree fast-forward when fetch updates headPaul Tan, May 13, 2015
  22. 6/9 t5520: test --rebase with multiple branchesPaul Tan, May 13, 2015
  23. 7/9 t5520: test --rebase failure on unborn branch with indexPaul Tan, May 13, 2015
  24. 8/9 t5521: test --dry-run does not make any changesPaul Tan, May 13, 2015
  25. 9/9 t5520: check reflog action in fast-forward mergePaul Tan, May 13, 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.