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

[PATCH v4 13/19] test: merge-pull-config: trivial cleanup

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Dec 8, 2020, 00:26 UTC
Message-ID
<20201208002648.1370414-14-felipe.contreras@gmail.com>
In-Reply-To
<20201208002648.1370414-1-felipe.contreras@gmail.com>
Commit e01ae2a4a7 introduced an extra space.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 t/t7601-merge-pull-config.sh | 1 -
 1 file changed, 1 deletion(-)
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index d709799f8b..8a6aae564a 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -33,7 +33,6 @@ test_expect_success 'pull.rebase not set' '
 	test_decode_color <err >decoded &&
 	test_i18ngrep "<YELLOW>hint: " decoded &&
 	test_i18ngrep "Pulling without specifying how to reconcile" decoded
-
 '
 
 test_expect_success 'pull.rebase not set (fast-forward)' '
-- 
2.29.2
Previous: Felipe ContrerasNext: Felipe Contreras
Message 16 of 21 in “pull: default ff-only mode”
  1. 00/19 pull: default ff-only modeFelipe Contreras, Dec 8, 2020
  2. 01/19 doc: pull: explain what is a fast-forwardFelipe Contreras, Dec 8, 2020
  3. 02/19 pull: improve default warningFelipe Contreras, Dec 8, 2020
  4. 03/19 pull: refactor fast-forward checkFelipe Contreras, Dec 8, 2020
  5. 04/19 pull: cleanup autostash checkFelipe Contreras, Dec 8, 2020
  6. 06/19 pull: move default warningFelipe Contreras, Dec 8, 2020
  7. 05/19 pull: trivial cleanupFelipe Contreras, Dec 8, 2020
  8. 07/19 pull: display default warning only when non-ffFelipe Contreras, Dec 8, 2020
  9. 08/19 pull: trivial whitespace style fixFelipe Contreras, Dec 8, 2020
  10. 09/19 pull: introduce --merge optionFelipe Contreras, Dec 8, 2020
  11. 10/19 pull: show warning with --ffFelipe Contreras, Dec 8, 2020
  12. 11/19 rebase: add REBASE_DEFAULTFelipe Contreras, Dec 8, 2020
  13. 12/19 pull: move configurations fetchesFelipe Contreras, Dec 8, 2020
  14. 14/19 test: pull-options: revert unnecessary changesFelipe Contreras, Dec 8, 2020
  15. 15/19 pull: trivial memory fixFelipe Contreras, Dec 8, 2020
  16. 13/19 test: merge-pull-config: trivial cleanupFelipe Contreras, Dec 8, 2020
  17. 17/19 pull: add pull.mode=ff-onlyFelipe Contreras, Dec 8, 2020
  18. 19/19 future: pull: enable ff-only mode by defaultFelipe Contreras, Dec 8, 2020
  19. 16/19 pull: add pull.modeFelipe Contreras, Dec 8, 2020
  20. 18/19 pull: advice of future changesFelipe Contreras, Dec 8, 2020
  21. Felipe ContrerasDec 8, 2020

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.