[PATCH] Fixing --help, usage for *-id
From: Pavel Roskin <hidden>
Date: 2016-06-15 22:42:06
Subsystem:
the rest · Maintainer:
Linus Torvalds
Hello! Removal of cg-Xlib inclusion in *-id scripts broke "--help" switch. When cg-Xlib is sourced indirectly through cg-Xnormid, the help text is treated like an ID, and its last word is dropped. Lack of USAGE string in the *-id scripts breaks the documentation generation because empty synopsis causes invalid XML. Thus the USAGE strings should be provided. Signed-off-by: Pavel Roskin <redacted>
diff --git a/cg-commit-id b/cg-commit-id
--- a/cg-commit-id
+++ b/cg-commit-id@@ -5,6 +5,10 @@ # # Takes the appropriate ID, defaults to HEAD. +USAGE="cg-commit-id" + +. ${COGITO_LIB}cg-Xlib + id="$1" normid=$(. ${COGITO_LIB}cg-Xnormid "$id") || exit 1 type=${normid#* }
diff --git a/cg-parent-id b/cg-parent-id
--- a/cg-parent-id
+++ b/cg-parent-id@@ -7,5 +7,9 @@ # # NOTE: Will return multiple SHA1s if ID is a commit with multiple parents. +USAGE="cg-parent-id" + +. ${COGITO_LIB}cg-Xlib + normid=$(. ${COGITO_LIB}cg-Xnormid "$1"^) echo ${normid%% *}
diff --git a/cg-tree-id b/cg-tree-id
--- a/cg-tree-id
+++ b/cg-tree-id@@ -5,6 +5,10 @@ # # Takes ID of the appropriate commit, defaults to HEAD. +USAGE="cg-tree-id" + +. ${COGITO_LIB}cg-Xlib + id="$1" normid=$(. ${COGITO_LIB}cg-Xnormid "$id") || exit 1 type=${normid#* }
--
Regards,
Pavel Roskin