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

[PATCH 5/7] clean: factorize incompatibility message

From
René Scharfe <l.s.r@web.de>
Date
Dec 6, 2023, 11:51 UTC
Message-ID
<20231206115215.94467-6-l.s.r@web.de>
In-Reply-To
<20231206115215.94467-1-l.s.r@web.de>

Use the standard parameterized message for reporting incompatible options to inform users that they can't use -x and -X together. This reduces the number of strings to translate and makes the UI slightly more consistent.

Signed-off-by: René Scharfe <l.s.r@web.de>
---
 builtin/clean.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 49c224e626..d90766cad3 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -971,7 +971,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 	dir.flags |= DIR_SHOW_OTHER_DIRECTORIES;

 	if (ignored && ignored_only)
-		die(_("-x and -X cannot be used together"));
+		die(_("options '%s' and '%s' cannot be used together"), "-x", "-X");
 	if (!ignored)
 		setup_standard_excludes(&dir);
 	if (ignored_only)
--
2.43.0
Previous: Taylor BlauNext: René Scharfe
Message 17 of 20 in “standardize incompatibility messages”
  1. 0/7 standardize incompatibility messagesRené Scharfe, Dec 6, 2023
  2. 3/7 revision: use die_for_incompatible_opt3() for --graph/--reverse/--walk-reflogsRené Scharfe, Dec 6, 2023
  3. Patrick SteinhardtDec 6, 2023
  4. René ScharfeDec 6, 2023
  5. Eric SunshineDec 6, 2023
  6. René ScharfeDec 6, 2023
  7. 4/7 revision, rev-parse: factorize incompatibility messages about --exclude-hiddenRené Scharfe, Dec 6, 2023
  8. Patrick SteinhardtDec 6, 2023
  9. René ScharfeDec 6, 2023
  10. Patrick SteinhardtDec 6, 2023
  11. René ScharfeDec 6, 2023
  12. Taylor BlauDec 6, 2023
  13. Patrick SteinhardtDec 7, 2023
  14. 1/7 push: use die_for_incompatible_opt4() for --delete/--tags/--all/--mirrorRené Scharfe, Dec 6, 2023
  15. 2/7 repack: use die_for_incompatible_opt3() for -A/-k/--cruftRené Scharfe, Dec 6, 2023
  16. Taylor BlauDec 6, 2023
  17. 5/7 clean: factorize incompatibility messageRené Scharfe, Dec 6, 2023
  18. 7/7 worktree: simplify incompatibility message for --orphan and commit-ishRené Scharfe, Dec 6, 2023
  19. 6/7 worktree: standardize incompatibility messagesRené Scharfe, Dec 6, 2023
  20. Patrick SteinhardtDec 6, 2023

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.