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

Re: [PATCH 1/8] git-rebase.sh: Fix --merge --abort failures when path contains whitespace

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Apr 9, 2008, 14:51 UTC
Message-ID
<47FCD7E8.40004@viscovery.net>
In-Reply-To
<20080409143702.GD24402@shion.is.fushizen.net>
Bryan Donlan schrieb:
Show 13 quoted lines
> On Wed, Apr 09, 2008 at 08:55:31AM +0200, Johannes Sixt wrote:
>> Bryan Donlan schrieb:
>>> +### Test that we handle strange characters properly
>>> +work_dir="$(pwd)/test \" ' \$ \\ dir"
>> In effect, you modify only this test to stress-test strange characters,
>> but other tests in the test suite still run in a "sane" environment. IOW,
>> I don't think you should go to this extreme for this one test only. The
>> better approach would be to rename 'trash' in test-lib.sh to this strange
>> name so that all tests suffer from a challenging environment.
> 
> I can do that, but it'd have to come as the last patch in the patchset,
> or it would obviously cause test failures. My goal here was to ensure
> that the bug I fixed in the patch would be tested in an isolated manner.

I for my taste could live without a test because the fix is so obvious. Given that you have to prepend 'cd "$work_dir"' to *all* the tests, this really just highlights that for the purpose of this test the name 'trash' of the regular test directory is just too simple ;)

Of course, it's Junio's draw, and he likes to have tests for fixes that are submitted.

> If you like I can add a change to the trash directory to the next rev of
> the patchset.
Yes, why not?
Show 9 quoted lines
>>> -		git reset --hard pre-rebase
>>> -		test_must_fail git rebase'"$type"' master &&
>>> -		test -d '$dotest' &&
>>> +		git reset --hard pre-rebase &&
>>> +		test_must_fail git rebase$type master &&
>>> +		test -d \"\$dotest\" &&
>> I could imagine that the missing && after the git reset is deliberate. Mike?
> 
> I assumed that if git reset failed here we'd probably want to know :)

On second sight, this indeed looks just like an omission and your change is good.

-- Hannes
Previous: Bryan DonlanNext: Bryan Donlan
Message 23 of 60 in “Fix git's test suite to pass when the path contains spaces”
  1. 0/8 Fix git's test suite to pass when the path contains spacesBryan Donlan, Apr 9, 2008
  2. 1/8 git-rebase.sh: Fix --merge --abort failures when path contains whitespaceBryan Donlan, Apr 9, 2008
  3. 2/8 config.c: Escape backslashes in section names properlyBryan Donlan, Apr 9, 2008
  4. 3/8 git-send-email.perl: Handle shell metacharacters in $EDITOR properlyBryan Donlan, Apr 9, 2008
  5. 4/8 test-lib.sh: Fix some missing path quotingBryan Donlan, Apr 9, 2008
  6. 5/8 test-lib.sh: Add a test_set_editor function to safely set $VISUALBryan Donlan, Apr 9, 2008
  7. 6/8 lib-git-svn.sh: Fix quoting issues with paths containing shell metacharactersBryan Donlan, Apr 9, 2008
  8. 7/8 Use test_set_editor in t9001-send-email.shBryan Donlan, Apr 9, 2008
  9. 8/8 Fix tests breaking when checkout path contains shell metacharactersBryan Donlan, Apr 9, 2008
  10. Johannes SixtApr 9, 2008
  11. Bryan DonlanApr 9, 2008
  12. Junio C HamanoApr 9, 2008
  13. Johannes SixtApr 9, 2008
  14. Johannes SixtApr 9, 2008
  15. Bryan DonlanApr 9, 2008
  16. Junio C HamanoApr 10, 2008
  17. Johannes SixtApr 9, 2008
  18. Bryan DonlanApr 9, 2008
  19. Johannes SixtApr 9, 2008
  20. Junio C HamanoApr 9, 2008
  21. Johannes SixtApr 9, 2008
  22. Bryan DonlanApr 9, 2008
  23. Johannes SixtApr 9, 2008
  24. Bryan DonlanApr 9, 2008
  25. Johannes SixtApr 10, 2008
  26. 00/10 Fix git's test suite to pass when the path contains spacesBryan Donlan, Apr 10, 2008
  27. 01/10 git-rebase.sh: Fix --merge --abort failures when path contains whitespaceBryan Donlan, Apr 10, 2008
  28. 02/10 config.c: Escape backslashes in section names properlyBryan Donlan, Apr 10, 2008
  29. 03/10 git-send-email.perl: Handle shell metacharacters in $EDITOR properlyBryan Donlan, Apr 10, 2008
  30. 04/10 test-lib.sh: Add a test_set_editor function to safely set $VISUALBryan Donlan, Apr 10, 2008
  31. 05/10 Use test_set_editor in t9001-send-email.shBryan Donlan, Apr 10, 2008
  32. 06/10 test-lib.sh: Fix some missing path quotingBryan Donlan, Apr 10, 2008
  33. 07/10 lib-git-svn.sh: Fix quoting issues with paths containing shell metacharactersBryan Donlan, Apr 10, 2008
  34. 08/10 Don't use the export NAME=value form in the test scripts.Bryan Donlan, Apr 10, 2008
  35. 09/10 Fix tests breaking when checkout path contains shell metacharactersBryan Donlan, Apr 10, 2008
  36. 10/10 Rename the test trash directory to contain shell metacharacters.Bryan Donlan, Apr 10, 2008
  37. Junio C HamanoApr 10, 2008
  38. Bryan DonlanApr 10, 2008
  39. Junio C HamanoApr 11, 2008
  40. 00/10 Fix git's test suite to pass when the path contains spacesBryan Donlan, May 4, 2008
  41. 01/10 git-rebase.sh: Fix --merge --abort failures when path contains whitespaceBryan Donlan, May 4, 2008
  42. 02/10 config.c: Escape backslashes in section names properlyBryan Donlan, May 4, 2008
  43. 03/10 git-send-email.perl: Handle shell metacharacters in $EDITOR properlyBryan Donlan, May 4, 2008
  44. 04/10 test-lib.sh: Add a test_set_editor function to safely set $VISUALBryan Donlan, May 4, 2008
  45. 05/10 Use test_set_editor in t9001-send-email.shBryan Donlan, May 4, 2008
  46. 06/10 test-lib.sh: Fix some missing path quotingBryan Donlan, May 4, 2008
  47. 07/10 lib-git-svn.sh: Fix quoting issues with paths containing shell metacharactersBryan Donlan, May 4, 2008
  48. 08/10 Don't use the export NAME=value form in the test scripts.Bryan Donlan, May 4, 2008
  49. 09/10 Fix tests breaking when checkout path contains shell metacharactersBryan Donlan, May 4, 2008
  50. 10/10 Rename the test trash directory to contain spaces.Bryan Donlan, May 4, 2008
  51. Johannes SixtMay 5, 2008
  52. Johannes SixtMay 5, 2008
  53. Bryan DonlanMay 5, 2008
  54. Johannes SixtMay 5, 2008
  55. Johannes SixtMay 5, 2008
  56. Bryan DonlanMay 5, 2008
  57. Johannes SixtMay 5, 2008
  58. Johannes SixtApr 10, 2008
  59. Bryan DonlanApr 10, 2008
  60. Junio C HamanoApr 10, 2008

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.