Re: [PATCH v2 1/8] git-prompt: use here-doc instead of here-string

Patrick Steinhardt
2024-08-16T08:50:12Z

On Thu, Aug 15, 2024 at 01:14:06PM +0000, Avi Halachmi (:avih) via GitGitGadget wrote:
> From: "Avi Halachmi (:avih)" <avihpit@yahoo.com>
>
> Here-documend is standard, and works in all shells.
>
> Both here-string and here-doc add final newline, which is important
> in this case, because $output is without final newline, but we do
> want "read" to succeed on the last line as well.
>
> Shells which support here-string:
> - bash, zsh, mksh, ksh93, yash (non-posix-mode).
>
> shells which don't, and got fixed:
> - ash-derivatives (dash, free/net bsd sh, busybox-ash).
> - pdksh, openbsd sh.
> - All Schily Bourne shell variants.
>
> Signed-off-by: Avi Halachmi (:avih) <avihpit@yahoo.com>
> ---
> contrib/completion/git-prompt.sh | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
> index 5330e769a72..ebf2e30d684 100644
> --- a/contrib/completion/git-prompt.sh
> +++ b/contrib/completion/git-prompt.sh
> @@ -137,7 +137,9 @@ __git_ps1_show_upstream ()
> upstream_type=svn+git # default upstream type is SVN if available, else git
> ;;
> esac
> - done <<< "$output"
> + done <<-OUTPUT
> + $output
> + OUTPUT

I was a bit sceptical at first whether this produces the correct output,
because I wasn't sure whether the first line might be indented while the
others wouldn't be. And that would only happen if we indented with
spaces, but when indenting with a tab it seems to work as expected.

Patrick

> # parse configuration values
> local option
> --
> gitgitgadget
>
>