From: Robert Abel Date: Mon, 04 Dec 2017 23:49:22 GMT Subject: [PATCH v3 1/2] git-prompt: make __git_eread intended use explicit Message-ID: <20171204234923.9600-1-rabel@robertabel.eu> In-Reply-To: <20171201233133.30011-1-rabel@robertabel.eu> __git_eread is used to read a single line of a given file (if it exists) into a single variable without the EOL. All six current users of __git_eread use it that way and don't expect multi-line content. Therefore, this patch removes the unused capability to split file conents into tokens by passing multiple variable names. Add a comment and explicitly use $2 instead of $@ to read the file into one variable. Signed-off-by: Robert Abel --- contrib/completion/git-prompt.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index c6cbef38c2..41a471957a 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -278,11 +278,12 @@ __git_ps1_colorize_gitstring () r="$c_clear$r" } +# Helper function to read the first line of a file into a variable. +# __git_eread requires 2 arguments, the file path and the name of the +# variable, in that order. __git_eread () { - local f="$1" - shift - test -r "$f" && read "$@" <"$f" + test -r "$1" && read "$2" <"$1" } # __git_ps1 accepts 0 or 1 arguments (i.e., format string) -- 2.13.0.windows.1