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

[PATCH 01/16] git-sh-setup: make usage text consistent

From
David Aguilar <davvid@gmail.com>
Date
Feb 24, 2013, 00:20 UTC
Message-ID
<1361665254-42866-2-git-send-email-davvid@gmail.com>
In-Reply-To
<1361665254-42866-1-git-send-email-davvid@gmail.com>

mergetool, bisect, and other commands that use git-sh-setup print a usage string that is inconsistent with the rest of Git when they are invoked as "git $cmd -h".

The compiled builtins use the lowercase "usage:" string but these commands say "Usage:". Adjust the shell library to make these consistent.

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 git-sh-setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 795edd2..9cfbe7f 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -84,14 +84,14 @@ if test -n "$OPTIONS_SPEC"; then
 else
 	dashless=$(basename "$0" | sed -e 's/-/ /')
 	usage() {
-		die "Usage: $dashless $USAGE"
+		die "usage: $dashless $USAGE"
 	}
 
 	if [ -z "$LONG_USAGE" ]
 	then
-		LONG_USAGE="Usage: $dashless $USAGE"
+		LONG_USAGE="usage: $dashless $USAGE"
 	else
-		LONG_USAGE="Usage: $dashless $USAGE
+		LONG_USAGE="usage: $dashless $USAGE
 
 $LONG_USAGE"
 	fi
-- 
1.8.2.rc0.247.g811e0c0
Previous: David AguilarNext: David Aguilar
Message 2 of 20 in “make usage text consistent in git commands”
  1. 00/16 make usage text consistent in git commandsDavid Aguilar, Feb 24, 2013
  2. 01/16 git-sh-setup: make usage text consistentDavid Aguilar, Feb 24, 2013
  3. 02/16 git-svn: make usage text consistentDavid Aguilar, Feb 24, 2013
  4. 03/16 git-relink: make usage text consistentDavid Aguilar, Feb 24, 2013
  5. 04/16 git-merge-one-file: make usage text consistentDavid Aguilar, Feb 24, 2013
  6. 05/16 git-archimport: make usage text consistentDavid Aguilar, Feb 24, 2013
  7. 06/16 git-cvsexportcommit: make usage text consistentDavid Aguilar, Feb 24, 2013
  8. 07/16 git-cvsimport: make usage text consistentDavid Aguilar, Feb 24, 2013
  9. 08/16 git-cvsimport: make usage text consistentDavid Aguilar, Feb 24, 2013
  10. 09/16 contrib/credential: make usage text consistentDavid Aguilar, Feb 24, 2013
  11. 10/16 contrib/fast-import: make usage text consistentDavid Aguilar, Feb 24, 2013
  12. 11/16 contrib/fast-import/import-zips.py: fix broken error messageDavid Aguilar, Feb 24, 2013
  13. 12/16 contrib/fast-import/import-zips.py: use spaces instead of tabsDavid Aguilar, Feb 24, 2013
  14. 13/16 contrib/examples: make usage text consistentDavid Aguilar, Feb 24, 2013
  15. 14/16 contrib/hooks/setgitperms.perl: make usage text consistentDavid Aguilar, Feb 24, 2013
  16. 15/16 templates/hooks--update.sample: make usage text consistentDavid Aguilar, Feb 24, 2013
  17. 16/16 Documentation/user-manual.txt: make usage text consistentDavid Aguilar, Feb 24, 2013
  18. Jonathan NiederFeb 24, 2013
  19. Jonathan NiederFeb 24, 2013
  20. David AguilarFeb 24, 2013

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.