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

[PATCH 39/40] whitespace: remediate t1000-read-tree-m-3way.sh

From
Jon Seymour <jon.seymour@gmail.com>
Date
Aug 6, 2011, 08:44 UTC
Message-ID
<1312620294-18616-39-git-send-email-jon.seymour@gmail.com>
In-Reply-To
<1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
	 expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
 t/t1000-read-tree-m-3way.sh |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh
index babcdd2..b461b42 100755
--- a/t/t1000-read-tree-m-3way.sh
+++ b/t/t1000-read-tree-m-3way.sh
@@ -169,7 +169,7 @@ checked.
   3  missing exists  missing   take A*     must match A, if exists.
  ------------------------------------------------------------------
   4  missing exists  A!=B      no merge    must match A and be
-                                           up-to-date, if exists.
+					   up-to-date, if exists.
  ------------------------------------------------------------------
   5  missing exists  A==B      take A      must match A, if exists.
  ------------------------------------------------------------------
@@ -180,21 +180,21 @@ checked.
   8  exists  missing O==B      remove      must not exist.
  ------------------------------------------------------------------
   9  exists  O!=A    missing   no merge    must match A and be
-                                           up-to-date, if exists.
+					   up-to-date, if exists.
  ------------------------------------------------------------------
  10  exists  O==A    missing   no merge    must match A
  ------------------------------------------------------------------
  11  exists  O!=A    O!=B      no merge    must match A and be
-                     A!=B                  up-to-date, if exists.
+		     A!=B                  up-to-date, if exists.
  ------------------------------------------------------------------
  12  exists  O!=A    O!=B      take A      must match A, if exists.
-                     A==B
+		     A==B
  ------------------------------------------------------------------
  13  exists  O!=A    O==B      take A      must match A, if exists.
  ------------------------------------------------------------------
  14  exists  O==A    O!=B      take B      if exists, must either (1)
-                                           match A and be up-to-date,
-                                           or (2) match B.
+					   match A and be up-to-date,
+					   or (2) match B.
  ------------------------------------------------------------------
  15  exists  O==A    O==B      take B      must match A if exists.
  ------------------------------------------------------------------

-- 
1.7.6.362.gf0e6
Previous: Jon SeymourNext: Jon Seymour
Message 44 of 51 in “test whitespace - perform trivial whitespace clean ups of test scripts.”
  1. 00/40 test whitespace - perform trivial whitespace clean ups of test scripts.Jon Seymour, Aug 6, 2011
  2. 01/40 test-cleaner: automate whitespace cleaning of test scriptsJon Seymour, Aug 6, 2011
  3. 02/40 whitespace: remediate t1001-read-tree-m-2way.shJon Seymour, Aug 6, 2011
  4. 03/40 whitespace: remediate t1006-cat-file.shJon Seymour, Aug 6, 2011
  5. Jeff KingAug 6, 2011
  6. Jon SeymourAug 6, 2011
  7. Junio C HamanoAug 6, 2011
  8. Jon SeymourAug 6, 2011
  9. 04/40 whitespace: remediate t1300-repo-config.shJon Seymour, Aug 6, 2011
  10. 05/40 whitespace: remediate t1503-rev-parse-verify.shJon Seymour, Aug 6, 2011
  11. 06/40 whitespace: remediate t3040-subprojects-basic.shJon Seymour, Aug 6, 2011
  12. 07/40 whitespace: remediate t3200-branch.shJon Seymour, Aug 6, 2011
  13. 08/40 whitespace: remediate t3406-rebase-message.shJon Seymour, Aug 6, 2011
  14. 09/40 whitespace: remediate t4002-diff-basic.shJon Seymour, Aug 6, 2011
  15. 10/40 whitespace: remediate t4010-diff-pathspec.shJon Seymour, Aug 6, 2011
  16. 11/40 whitespace: remediate t5300-pack-object.shJon Seymour, Aug 6, 2011
  17. 12/40 whitespace: remediate t5301-sliding-window.shJon Seymour, Aug 6, 2011
  18. 13/40 whitespace: remediate t5302-pack-index.shJon Seymour, Aug 6, 2011
  19. 14/40 whitespace: remediate t5303-pack-corruption-resilience.shJon Seymour, Aug 6, 2011
  20. 15/40 whitespace: remediate t5400-send-pack.shJon Seymour, Aug 6, 2011
  21. 16/40 whitespace: remediate t5402-post-merge-hook.shJon Seymour, Aug 6, 2011
  22. 17/40 whitespace: remediate t5403-post-checkout-hook.shJon Seymour, Aug 6, 2011
  23. 18/40 whitespace: remediate t5510-fetch.shJon Seymour, Aug 6, 2011
  24. 19/40 whitespace: remediate t6002-rev-list-bisect.shJon Seymour, Aug 6, 2011
  25. 20/40 whitespace: remediate t6005-rev-list-count.shJon Seymour, Aug 6, 2011
  26. 21/40 whitespace: remediate t6030-bisect-porcelain.shJon Seymour, Aug 6, 2011
  27. 22/40 whitespace: remediate t7003-filter-branch.shJon Seymour, Aug 6, 2011
  28. 23/40 whitespace: remediate t7004-tag.shJon Seymour, Aug 6, 2011
  29. 24/40 whitespace: remediate t7403-submodule-sync.shJon Seymour, Aug 6, 2011
  30. 25/40 whitespace: remediate t7500-commit.shJon Seymour, Aug 6, 2011
  31. 26/40 whitespace: remediate t7810-grep.shJon Seymour, Aug 6, 2011
  32. 27/40 whitespace: remediate t9100-git-svn-basic.shJon Seymour, Aug 6, 2011
  33. 28/40 whitespace: remediate t9104-git-svn-follow-parent.shJon Seymour, Aug 6, 2011
  34. 29/40 whitespace: remediate t9107-git-svn-migrate.shJon Seymour, Aug 6, 2011
  35. 30/40 whitespace: remediate t9108-git-svn-glob.shJon Seymour, Aug 6, 2011
  36. 31/40 whitespace: remediate t9109-git-svn-multi-glob.shJon Seymour, Aug 6, 2011
  37. 32/40 whitespace: remediate t9110-git-svn-use-svm-props.shJon Seymour, Aug 6, 2011
  38. 33/40 whitespace: remediate t9118-git-svn-funky-branch-names.shJon Seymour, Aug 6, 2011
  39. 34/40 whitespace: remediate t9125-git-svn-multi-glob-branch-names.shJon Seymour, Aug 6, 2011
  40. 35/40 whitespace: remediate t9400-git-cvsserver-server.shJon Seymour, Aug 6, 2011
  41. 36/40 whitespace: remediate t9401-git-cvsserver-crlf.shJon Seymour, Aug 6, 2011
  42. 37/40 whitespace: remediate t9500-gitweb-standalone-no-errors.shJon Seymour, Aug 6, 2011
  43. 38/40 whitespace: remediate t9603-cvsimport-patchsets.shJon Seymour, Aug 6, 2011
  44. 39/40 whitespace: remediate t1000-read-tree-m-3way.shJon Seymour, Aug 6, 2011
  45. 40/40 whitespace: remediate t6120-describe.shJon Seymour, Aug 6, 2011
  46. Jon SeymourAug 6, 2011
  47. whitespace: additional whitespace clean ups.Jon Seymour, Aug 6, 2011
  48. Jon SeymourAug 6, 2011
  49. Jeff KingAug 6, 2011
  50. Jon SeymourAug 6, 2011
  51. 01/40 test-cleaner: automate whitespace cleaning of test scriptsJon Seymour, Aug 6, 2011

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.