git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Taylor Blau <me@ttaylorr.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Taylor Blau <me@ttaylorr.com>, John Cai <johncai86@gmail.com>,
	git@vger.kernel.org, levraiphilippeblain@gmail.com,
	phillip.wood123@gmail.com, Tilman Vogel <tilman.vogel@web.de>
Subject: Re: [PATCH v3] builtin/pull.c: teach run_merge() to honor rebase.autostash config
Date: Thu, 6 Jan 2022 14:36:05 -0500	[thread overview]
Message-ID: <YddEpUEA9Hnxqam+@nand.local> (raw)
In-Reply-To: <xmqqee5kemxj.fsf@gitster.g>

On Thu, Jan 06, 2022 at 10:31:04AM -0800, Junio C Hamano wrote:
> 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

      reply	other threads:[~2022-01-06 19:36 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-06 15:02 [PATCH v3] builtin/pull.c: teach run_merge() to honor rebase.autostash config John Cai
2022-01-06 17:12 ` Taylor Blau
2022-01-06 17:14   ` Taylor Blau
2022-01-06 18:31   ` Junio C Hamano
2022-01-06 19:36     ` Taylor Blau [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YddEpUEA9Hnxqam+@nand.local \
    --to=me@ttaylorr.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johncai86@gmail.com \
    --cc=levraiphilippeblain@gmail.com \
    --cc=phillip.wood123@gmail.com \
    --cc=tilman.vogel@web.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).