Re: [PATCH v3] builtin/pull.c: teach run_merge() to honor rebase.autostash config

From: Taylor Blau <me@ttaylorr.com>
Date: Jan 6, 2022, 19:36 UTC
Message-ID: <YddEpUEA9Hnxqam+@nand.local>
In-Reply-To: <xmqqee5kemxj.fsf@gitster.g>

On Thu, Jan 06, 2022 at 10:31:04AM -0800, Junio C Hamano wrote:

Show 19 quoted lines

> Taylor Blau <me@ttaylorr.com> writes:
>
> >> +	git clone src dst &&
> >> +	test_commit -C src --printf "more_content" file "more content\ncontent\n" &&
> >
> > Same note here, but I think the `--printf` is unnecessary. Running
> > `echo` with "\n" characters in its argument is fine, so this could be
> > shortened to:
> >
> >     test_commit -C src blah file "more\ncontent"
>
> Is that true for everybody's shell, or just dash?
>
> $ bash -c 'echo "a\nb\nc"'
> a\nb\nc
> $ dash -c 'echo "a\nb\nc"'
> a
> b
> c

Ah, of course: thanks for the reminder. Do ignore my comment about `--printf` being unnecessary, since it is quite necessary depending on your shell.

In either case, I still think the quoting around "more_content" is unnecessary (but the same is not true for the string containing newlines).

Thanks, Taylor